summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."Nils Gladitz2015-04-3017-129/+3
| | | | | | | | | | | | This reverts commit 242c3966 (add_custom_command: Diagnose MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands, 2015-03-26). I misdiagnosed the underlying issue that prompted creation of policy CMP0057. The actual issue surfaces when a single custom command's MAIN_DEPENDENCY is listed in more than one target; this issue will have to be addressed independently.
* CMake Nightly Date StampKitware Robot2015-04-291-1/+1
|
* Merge topic 'deterministic-CTest-tests'Brad King2015-04-282-0/+4
|\ | | | | | | | | bf24b6c5 Tests: Guard more CTest tests against parallel execution.
| * Tests: Guard more CTest tests against parallel execution.Stephen Kelly2015-04-272-0/+4
| |
* | Merge topic 'include-early-optional-handling'Brad King2015-04-281-1/+13
|\ \ | | | | | | | | | | | | 8d9f39f4 include: Ask for permission, rather than forgiveness.
| * | include: Ask for permission, rather than forgiveness.Stephen Kelly2015-04-271-1/+13
| |/ | | | | | | | | | | Check that a non-optional file exists before attempting to include it. This makes more sense than relying on an error case deeper within cmListFileCache.
* | Merge topic 'fix-osx-framework-detection'Brad King2015-04-281-9/+2
|\ \ | | | | | | | | | | | | c46490da cmSystemTools: Fix IsPathToFramework implementation (#15535)
| * | cmSystemTools: Fix IsPathToFramework implementation (#15535)Brad King2015-04-271-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use more reliable logic to detect if a path ends in ".framework". The old logic added by commit v2.4.0~791 (add better support for framework linking, 2005-12-26) did not account for paths not ending in it at all. With a 9-character path the logic and "npos == -1" happens to make the old check pass.
* | | Merge topic 'InstallRequiredSystemLibraries-fix-mbcs'Brad King2015-04-281-7/+2
|\ \ \ | | | | | | | | | | | | | | | | ff183986 InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)
| * | | InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)Bjoern Thiel2015-04-271-7/+2
| |/ / | | | | | | | | | | | | | | | | | | Fix the logic added by commit v3.0.0-rc5~9^2 (InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12, 2014-05-06). Do not test content of MSVC${v}_MFC_DIR until after the variable is set.
* | | Merge topic 'doc-sizeof_void_p'Brad King2015-04-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 1b03332e Help: Clarify that CMAKE_SIZEOF_VOID_P is specific to the target machine
| * | | Help: Clarify that CMAKE_SIZEOF_VOID_P is specific to the target machineNils Gladitz2015-04-231-1/+1
| |/ /
* | | Merge topic 'test-ExportImport-AIX-GCC'Brad King2015-04-281-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 4fc47424 Tests: Fix ExportImport on AIX with GCC
| * | | Tests: Fix ExportImport on AIX with GCCBrad King2015-04-231-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iface_test_bld gets the excludedFromAll include directory with "-isystem" because it is added indirectly through an imported target. On AIX with GCC the -isystem flag causes sources to be preprocessed as: # 3 "/.../excludedFromAll.h" 2 3 4 The flags after the file name are documented here: https://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html and the "4" flag says that following content is extern "C". This causes the excludedFromAll function to be declared as a C symbol and not mangled for C++, which fails to link later because the symbol is really provided as C++. Work around this by setting the NO_SYSTEM_FROM_IMPORTED target property on iface_test_bld. Somehow iface_test_exp does not end up with -isystem so we do not need this workaround for that target.
* | | Merge topic 'doc-CTEST_USE_LAUNCHERS-ninja'Brad King2015-04-282-67/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7244e845 ctest: Consolidate documentation of CTEST_USE_LAUNCHERS (#15533) f693c136 Modules/CTest: Improve documentation formatting 5cbedd6b Modules/CTest: Use bracket comment for documentation block
| * | | ctest: Consolidate documentation of CTEST_USE_LAUNCHERS (#15533)Brad King2015-04-282-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of this variable in the CTest module is outdated and has been superseded by the ctest(1) manual. In particular, the latter mentions that it works with the Ninja generator as well as makefile generators. Remove the documentation from the CTest module and replace it with a link to the main variable documentation (which already references the ctest(1) manual).
| * | | Modules/CTest: Improve documentation formattingBrad King2015-04-281-34/+26
| | | | | | | | | | | | | | | | Use inline reStructuredText markup and add cross-references.
| * | | Modules/CTest: Use bracket comment for documentation blockBrad King2015-04-281-65/+66
| | | |
* | | | Merge topic 'fix-test-RunCMake.CTest-line-numbers'Brad King2015-04-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | 75bd5ca0 Tests: Fix RunCMake.CTest to tolerate source line number changes
| * | | Tests: Fix RunCMake.CTest to tolerate source line number changesBrad King2015-04-271-1/+1
| |/ /
* | | CMake Nightly Date StampKitware Robot2015-04-281-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2015-04-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2015-04-261-1/+1
| |
* | CMake Nightly Date StampKitware Robot2015-04-251-1/+1
| |
* | CMake Nightly Date StampKitware Robot2015-04-241-1/+1
|/
* Merge topic 'cpack-deb-linitian-md5hash'Brad King2015-04-2310-0/+440
|\ | | | | | | | | | | 75b0e167 CPackDeb: Add basic package tests fdfe4586 CPackDeb: Fix lintian md5sum file warning
| * CPackDeb: Add basic package testsRaffi Enficiaud2015-04-239-0/+434
| | | | | | | | | | Tests of generated component based deb packages with lintian and dpkg. Also includes basic file name check.
| * CPackDeb: Fix lintian md5sum file warningRaffi Enficiaud2015-04-231-0/+6
| | | | | | | | Lintian warned about invalid md5sum file permissions.
* | Merge topic 'allow-empty-CMAKE_TOOLCHAIN_FILE'Brad King2015-04-231-1/+1
|\ \ | | | | | | | | | | | | 22926dd6 Allow CMAKE_TOOLCHAIN_FILE to be an empty string
| * | Allow CMAKE_TOOLCHAIN_FILE to be an empty stringAndrey Pokrovskiy2015-04-221-1/+1
| | | | | | | | | | | | | | | Do not try to include() an empty string in the generated CMakeSystem module.
* | | Merge topic 'check-compiler-flag-clang'Brad King2015-04-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 680ebebc Check*CompilerFlag: Add another pattern for Clang (#15526)
| * | | Check*CompilerFlag: Add another pattern for Clang (#15526)Dan Kegel2015-04-221-0/+1
| | | | | | | | | | | | | | | | Match 'optimization flag ... not supported' messages.
* | | | Merge topic 'mingw-64'Brad King2015-04-231-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c775072a cmGeneratorExpressionEvaluationFile: Add missing sys/types.h include
| * | | | cmGeneratorExpressionEvaluationFile: Add missing sys/types.h includeBrad King2015-04-221-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This is needed for 'mode_t', and on mingw-w64 in particular. We added use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use permissions of input file if present, 2014-07-22).
* | | | Merge topic 'bash-completion-updates'Brad King2015-04-233-3/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2ecf168f bash-completion: Avoid using _init_completion when not defined
| * | | | bash-completion: Avoid using _init_completion when not definedGaëtan Lehmann2015-04-223-3/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the current version of homebrew one gets: bash: _init_completion: command not found Avoid this by initializing manually when the function is not defined.
* | | | Merge topic 'deterministic-CTest-tests'Brad King2015-04-232-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | b5b20d20 ctest: Treat ENV{CTEST_OUTPUT_ON_FAILURE} as a boolean fcf9cf6c Tests: Make a CTest test deterministic.
| * | | | ctest: Treat ENV{CTEST_OUTPUT_ON_FAILURE} as a booleanBrad King2015-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Having this variable in the environment should not be enough to activate the behavior. It must also not be set to a false value (or empty value).
| * | | | Tests: Make a CTest test deterministic.Stephen Kelly2015-04-201-0/+3
| | | | | | | | | | | | | | | | | | | | The test expect sub-test not to run in parallel.
* | | | | CMake Nightly Date StampKitware Robot2015-04-231-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'ExternalProject-depend-INTERFACE'Brad King2015-04-2210-5/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e1c6df39 ExternalProject: Allow dependencies on INTERFACE libraries c0502faa ExternalProject: Fix error message typo
| * | | | ExternalProject: Allow dependencies on INTERFACE librariesBrad King2015-04-2210-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | Respect INTERFACE library property whitelist. Check that a target has type "UTILITY" before querying other properties.
| * | | | ExternalProject: Fix error message typoBrad King2015-04-211-1/+1
| | | | |
* | | | | Merge topic 'ExternalProject-genex'Brad King2015-04-2211-16/+74
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b470d618 Help: Add notes for topic 'ExternalProject-genex' 0273ef14 ExternalProject: Allow generator expressions with LOG_* options (#15287) 7bd8cfb8 ExternalProject: Allow generator expressions in initial cache options 1cf43dcf Tests: Add case to cover ExternalProject with subdirectories
| * | | | Help: Add notes for topic 'ExternalProject-genex'Brad King2015-04-211-0/+6
| | | | |
| * | | | ExternalProject: Allow generator expressions with LOG_* options (#15287)Andrey Pokrovskiy2015-04-213-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use file(GENERATE) to write the logging wrapper scripts to evaluate generator expressions. Use a per-config script names in case the content varies by configuration.
| * | | | ExternalProject: Allow generator expressions in initial cache optionsAndrey Pokrovskiy2015-04-217-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use file(GENERATE) to write the initial cache file so that we can evaluate generator expressions. Use a per-config initial cache file name in case the content varies by configuration.
| * | | | Tests: Add case to cover ExternalProject with subdirectoriesBrad King2015-04-213-0/+32
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Add an ExternalProjectSubdir test directory with a minimal test showing use of ExternalProject_Add for a source tree in a subdirectory. This will allow us to easily add test external projects that cover specific behavior where the client project must check results.
* | | | Merge topic 'fix-CTestTestSerialOrder-parallel-env'Brad King2015-04-221-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2f4b13b3 Tests: Protect CTestTestSerialOrder from environment (#15524)
| * | | | Tests: Protect CTestTestSerialOrder from environment (#15524)Brad King2015-04-211-0/+1
| |/ / / | | | | | | | | | | | | Reported-by: Stephen Kelly <steveire@gmail.com>