summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add RunCMake.CTestSubmit cases covering ctest_submit failuresBrad King2015-01-1913-0/+81
| | | | | | Cover command invocation argument errors. Prepare infrastructure to cover failed 'drop' cases, but do not cover them yet because we need to collect error messages from each platform.
* Merge topic 'windows-utf-8'Brad King2015-01-163-4/+28
|\ | | | | | | | | cdc29c36 Encoding: Switch to use UTF-8 internally by default on Windows.
| * Encoding: Switch to use UTF-8 internally by default on Windows.Clinton Stimpson2015-01-163-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | This fixes several reported bugs about CMake not handling non-ascii paths on Windows. Practically, the use of some unicode characters may still be limited by the build or compiler tools. For example, a user may be limited by the build tools to using characters within the Windows ANSI code page (which can include non-ascii characters in the current system language).
* | Merge topic 'fix-qcc-compiler-id'Brad King2015-01-163-3/+3
|\ \ | | | | | | | | | | | | 9c9bc712 QNX: Fix detection of QCC compiler id (#15349)
| * | QNX: Fix detection of QCC compiler id (#15349)Brad King2015-01-143-3/+3
| | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~113^2 (Use a more reliable regex for extracting binary INFO strings, 2014-09-03) the matching of INFO: strings was made more strict and no longer matches just "INFO:qnxnto". Use "INFO:qnxnto[]" instead to conform to the new pattern.
* | | Merge topic 'tests-RunCMake-report-command'Brad King2015-01-161-0/+4
|\ \ \ | | | | | | | | | | | | | | | | 6c121924 Tests: Teach RunCMake to report command-line on failure
| * | | Tests: Teach RunCMake to report command-line on failureBrad King2015-01-151-0/+4
| | | | | | | | | | | | | | | | | | | | When a test sets RunCMake_TEST_COMMAND, report the command line on failure to make it easier to run by hand for debugging.
* | | | Merge topic 'libarchive-constify-internal-get_date'Brad King2015-01-161-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6b9a0e17 libarchive: Constify internal __archive_get_date implementation
| * | | | libarchive: Constify internal __archive_get_date implementationBrad King2015-01-151-4/+4
| |/ / / | | | | | | | | | | | | | | | | The caller of this API already re-declares it as const, so update the implementation accordingly.
* | | | Merge topic 'import-jsoncpp'Brad King2015-01-1623-0/+6388
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89cd3d27 jsoncpp: Add README-CMake.txt 7e310624 jsoncpp: Provide 'isfinite' implementation on Solaris 4c496065 jsoncpp: Provide 'isfinite' implementation on ancient glibc 50032bc8 jsoncpp: Add missing assert before strcmp in json_value.cpp ad94b052 jsoncpp: Add missing <iosfwd> include in json/writer.h 7eba04fd jsoncpp: Include C headers since we use APIs without std:: 06f41e98 jsoncpp: Disable warnings to avoid changing 3rd party code 1fc55653 jsoncpp: Build the library within CMake 84d5674d jsoncpp: Include "config.h" before system headers a263d519 Merge branch 'jsoncpp-upstream' into import-jsoncpp 53f6ccb0 JsonCpp 1.0.0 (reduced) 32fd56b0 jsoncpp: Add .gitattributes to skip whitespace checks
| * | | | jsoncpp: Add README-CMake.txtBrad King2015-01-151-0/+66
| | | | | | | | | | | | | | | | | | | | Describe how to update jsoncpp from upstream.
| * | | | jsoncpp: Provide 'isfinite' implementation on SolarisBrad King2015-01-151-0/+6
| | | | | | | | | | | | | | | | | | | | Solaris provides a 'finite' function in <ieeefp.h>.
| * | | | jsoncpp: Provide 'isfinite' implementation on ancient glibcBrad King2015-01-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | The glibc 2.1 headers provide isfinite only in C99 mode. Add its definition ourselves.
| * | | | jsoncpp: Add missing assert before strcmp in json_value.cppBrad King2015-01-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strcmp function does not allow NULL pointers, so add an assert to tell Clang scan-build that the code does not expect a NULL pointer.
| * | | | jsoncpp: Add missing <iosfwd> include in json/writer.hBrad King2015-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | The header uses std::ostream, so it must be declared.
| * | | | jsoncpp: Include C headers since we use APIs without std::Brad King2015-01-152-5/+5
| | | | |
| * | | | jsoncpp: Disable warnings to avoid changing 3rd party codeBrad King2015-01-152-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Add '-w' or equivalent flag on compilers supporting it. Tell MSVC to use its lowest warning level inside jsoncpp sources.
| * | | | jsoncpp: Build the library within CMakeBrad King2015-01-155-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update json/json.h to account for our lack of autolink.h. Update json/config.h to include KWSys Large File Support configuration so that consistent stream libraries are used (on AIX with XL). Add a cm_jsoncpp_reader.h header to include the CMake-provided copy of the json/reader.h header from CMake sources.
| * | | | jsoncpp: Include "config.h" before system headersBrad King2015-01-151-2/+2
| | | | |
| * | | | Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-1318-0/+6249
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.
| | * | | | JsonCpp 1.0.0 (reduced)JsonCpp Upstream2015-01-1318-0/+6249
| | / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream JsonCpp using the following shell code. url=https://github.com/open-source-parsers/jsoncpp && v=1.0.0 && r=7165f6ac && paths=" LICENSE include/json src/lib_json " && remove=" include/json/autolink.h src/lib_json/CMakeLists.txt src/lib_json/sconscript src/lib_json/version.h.in " && mkdir jsoncpp-$v-g$r-reduced && git clone $url jsoncpp-git && date=$(cd jsoncpp-git && git log -n 1 --format='%cd' $r) && (cd jsoncpp-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd jsoncpp-$v-g$r-reduced && tar xv && rm -f $remove) && echo "g$r date: $date"
| * | | | jsoncpp: Add .gitattributes to skip whitespace checksBrad King2015-01-131-0/+1
| |/ / /
* | | | Merge topic 'ExternalData-custom-download'Brad King2015-01-1620-185/+438
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 829fc5ad Help: Add notes for topic 'ExternalData-custom-download' 0fe4d8bb ExternalData: Add support for custom download scripts 945571db ExternalData: Improve documentation organization a32b2245 ExternalData: Re-order documentation 531e75e0 ExternalData: Document all variables defined by module f3884b47 ExternalData: Split documentation into sections 4ab5c652 ExternalData: Convert docs to a bracket comment
| * | | | Help: Add notes for topic 'ExternalData-custom-download'Brad King2015-01-152-0/+9
| | | | |
| * | | | ExternalData: Add support for custom download scriptsBrad King2015-01-1519-1/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a special URL template to map the fetch operation to a project-specified .cmake script insead of using file(DOWNLOAD). Extend the Module.ExternalData test to cover the behavior. Extend the RunCMake.ExternalData test to cover error cases.
| * | | | ExternalData: Improve documentation organizationBrad King2015-01-151-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the basic DATA{} description to a section just before the file series description. Move all sections on referencing files into subsections of a common "Referencing Files" section. Subsume example usage into the introduction since it gives a high-level starting point to understand the rest of the docs.
| * | | | ExternalData: Re-order documentationBrad King2015-01-151-97/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put example usage just after the intro. Put hash algos last. Put variables right after functions since they both cover the module API.
| * | | | ExternalData: Document all variables defined by moduleBrad King2015-01-151-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Extend the "Module Variables" section to list variables previously mentioned only in text.
| * | | | ExternalData: Split documentation into sectionsBrad King2015-01-151-67/+111
| | | | | | | | | | | | | | | | | | | | Also explicitly mark functions and variables.
| * | | | ExternalData: Convert docs to a bracket commentBrad King2015-01-151-184/+185
| | | | | | | | | | | | | | | | | | | | | | | | | Use a bracket comment to hold the documentation instead of a block of line comments. This will make further updates easier.
* | | | | Merge topic 'fix-ctest_build-output-processing-regression'Brad King2015-01-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 509f2713 ctest_build: Fix logic regression in parent that clips build output
| * | | | | ctest_build: Fix logic regression in parent that clips build outputBrad King2015-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sweeping pattern change in commit 238dd2fb (Use insert instead of a loop in some cases, 2014-11-22) accidentally changed the iterator range used on the queue in cmCTestBuildHandler::ProcessBuffer. Instead of ending at the iterator positioned at the next newline to populate CurrentProcessingLine, it was changed to go to the end of the queue. This causes the line to contain newlines and possibly be cut off in the middle of a line. Fix this regression by restoring use of the proper end-of-line position.
* | | | | | CMake Nightly Date StampKitware Robot2015-01-161-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'release'Brad King2015-01-150-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'cpack-PackageMaker-OSX-10.10' into releaseBrad King2015-01-152-10/+26
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-LOCATION-with-TARGET_OBJECTS' into releaseBrad King2015-01-145-0/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindRuby-zero-version' into releaseBrad King2015-01-141-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindRuby-fix-version' into releaseBrad King2015-01-141-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindBoost-update-versions' into releaseBrad King2015-01-141-1/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'FindGit-local-Github'Brad King2015-01-152-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff880ece Help: Add notes for topic 'FindGit-local-Github' 54690624 FindGit: Search in 'GitHub for Windows' user directory
| * | | | | | | | | | | Help: Add notes for topic 'FindGit-local-Github'Brad King2015-01-141-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | FindGit: Search in 'GitHub for Windows' user directoryFrank Park2015-01-131-0/+4
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'Apple-compiler-selection'Brad King2015-01-152-8/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da928d30 Help: Add notes for topic 'Apple-compiler-selection' 1f085e11 OS X: Resolve compiler in /usr/bin to that reported by Xcode xcrun 85d31735 CMakeDetermineCompiler: Factor out xcrun invocation into a macro
| * | | | | | | | | | | Help: Add notes for topic 'Apple-compiler-selection'Brad King2015-01-141-0/+8
| | | | | | | | | | | |
| * | | | | | | | | | | OS X: Resolve compiler in /usr/bin to that reported by Xcode xcrunStephen Kelly2015-01-141-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler in the PATH on mac is a stub for a different delegate depending on the environment. Rather than requiring xcode-select to change the used Xcode globally, users should be able to choose the compiler per-session. That is possible with the DEVELOPER_DIR environment variable. However, the environment can change between running CMake and invoking the build. In such cases, CMake prefers to record the relevant paths from the environment and use them when invoking the build. That is not currently done for the compilers on APPLE, so the compiler used is not the one reported when running cmake: $ DEVELOPER_DIR=/Applications/Xcode2.app/Contents/Developer/ cc --version Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn) Target: x86_64-apple-darwin13.4.0 Thread model: posix $ DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer/ cc --version Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn) Target: x86_64-apple-darwin13.4.0 Thread model: posix Update that now by querying Xcode for the correct compiler path if the compiler located by ordinary means is located in /usr/bin.
| * | | | | | | | | | | CMakeDetermineCompiler: Factor out xcrun invocation into a macroStephen Kelly2015-01-141-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow it to be re-used in multiple code paths later.
* | | | | | | | | | | | Merge topic 'safer-msmpi-checks'Brad King2015-01-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68857ccd FindMPI: handle trailing slash from $MSMPI_BIN
| * | | | | | | | | | | | FindMPI: handle trailing slash from $MSMPI_BINBen Boeckel2015-01-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing, MSMPI puts a trailing backslash in the MSMPI_BIN environment variable. This causes trouble when concatenating in CMake since the list separator is now escaped and no longer a list separator due to the trailing backslash. Instead, use file(TO_CMAKE_PATH) to make the path CMake-friendly.
* | | | | | | | | | | | | Merge topic 'Xcode-clang-compile-features'Brad King2015-01-156-17/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcd72a74 Help: Add notes for topic 'Xcode-clang-compile-features' 3ad893b5 Features: Record for historical Xcode clang versions. 98965fb1 Features: Record dialect flags for AppleClang 4.0+.
| * | | | | | | | | | | | | Help: Add notes for topic 'Xcode-clang-compile-features'Brad King2015-01-141-0/+5
| | | | | | | | | | | | | |