summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'gicv-stdstring'Brad King2018-09-129-66/+64
|\ | | | | | | | | | | | | 13d10ee616 cmState::GetInitializedCacheValue: Return as const std::string* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2365
| * cmState::GetInitializedCacheValue: Return as const std::string*Vitaly Stakhovsky2018-09-109-66/+64
| |
* | Merge topic 'IAR_6_50_6_fix'Brad King2018-09-121-0/+3
|\ \ | | | | | | | | | | | | | | | | | | 8fdf08c097 IAR: Fix compiler id, version, and arch detection on 6.50.6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2371
| * | IAR: Fix compiler id, version, and arch detection on 6.50.6Daniel Schürmann2018-09-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The IAR 6.50.6 compiler places extra/truncated copies of the compiler id `INFO:` strings into binaries with a prefix like `?<Constant "`. Teach CMakeDetermineCompilerId to ignore them. Fixes: #18333
* | | Merge branch 'release-3.12'Brad King2018-09-120-0/+0
|\ \ \
| * \ \ Merge branch 'FindDoxygen-CMP0057' into release-3.12Brad King2018-09-111-0/+5
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2373
* | \ \ \ Merge topic 'FindDoxygen-CMP0057'Brad King2018-09-121-0/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | e8213404ce FindDoxygen: Ensure policy settings allow use of IN_LIST Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2373
| * | | | FindDoxygen: Ensure policy settings allow use of IN_LISTBrad King2018-09-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) use of the `IN_LIST` condition was added, but this is only supported when policy CMP0057 is set to NEW. Add a policy scope around the module and enable the policy within it. Otherwise it works only in projects that happen to enable the policy. Fixes: #18361
* | | | | Merge topic 'unused-variables-cleanup'Craig Scott2018-09-122-5/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c154fec6b Warnings: Remove unused variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2364
| * | | | | Warnings: Remove unused variablesCraig Scott2018-09-112-5/+0
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-09-121-1/+1
| | | | | |
* | | | | | Merge topic 'gtest_add_tests-empty-file'Craig Scott2018-09-113-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31c82143bf GoogleTest: gtest_add_tests() fails if any source file is empty d6b06d8d87 GoogleTest: Modify test to verify that empty files can be scanned Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2342
| * | | | | | GoogleTest: gtest_add_tests() fails if any source file is emptyAlessandro2018-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18321
| * | | | | | GoogleTest: Modify test to verify that empty files can be scannedCraig Scott2018-09-102-3/+4
| | | | | | | | | | | | | | | | | | | | | The modified test confirms the bug described in issue #18321.
* | | | | | | Merge topic 'iar-fail-early'Brad King2018-09-113-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a26ebb894b IAR: Abort if compiler version or target architecture is not detected Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2353
| * | | | | | | IAR: Abort if compiler version or target architecture is not detectedDaniel Schürmann2018-09-103-0/+14
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If these are not detected then we cannot support the IAR compiler. Fail early with an explicit message instead of silently proceeding and getting strange errors. Issue: #18333
* | | | | | | Merge topic 'cmake_cpack_command-doc'Brad King2018-09-112-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ff7149298 Help: Document existence of CMAKE_CPACK_COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2367
| * | | | | | | Help: Document existence of CMAKE_CPACK_COMMANDKyle Edwards2018-09-102-0/+9
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This useful variable was previously undocumented. This commit adds brief documentation for it.
* | | | | | | Merge topic 'replace-os-x-name-with-macos'Brad King2018-09-1154-126/+126
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS" Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Gregor Jasny <gjasny@googlemail.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Merge-request: !2351
| * | | | | | | Replace occurrences of "Mac OS X" with "macOS" in commentsBartosz Kosiorek2018-09-108-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple's main Operating system changed their name from OS X to macOS: https://www.engadget.com/2016/06/13/os-x-is-now-macos/ Revise source comments accordingly.
| * | | | | | | Help: Replace occurrences of "Mac OS X" with "macOS"Bartosz Kosiorek2018-09-0546-115/+115
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple's main Operating system changed their name from OS X to macOS: https://www.engadget.com/2016/06/13/os-x-is-now-macos/ Revise documentation accordingly.
* | | | | | | Merge topic 'docs/setdirproprs'Brad King2018-09-112-7/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d8cabe8d4 Help: Clarify INCLUDE_DIRECTORIES directory property behavior 7b9d8ce168 Help: Clarify wording of set_directory_properties docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2337
| * | | | | | | Help: Clarify INCLUDE_DIRECTORIES directory property behaviorBrian Heim2018-09-101-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ordering w.r.t. target creation is important for this property. Fixes: #17754
| * | | | | | | Help: Clarify wording of set_directory_properties docsBrian Heim2018-09-101-4/+3
| | | | | | | |
* | | | | | | | Merge topic 'imported-same-name'Brad King2018-09-1132-221/+297
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f35be59961 Fix transitive usage requirements through same-name imported targets 1b57f49586 genex: Simplify cmGeneratorExpressionInterpreter bea390e9bd Fix dependency propagation through same-name imported targets fc7e4d1ed8 cmLinkItem: Convert to a "sum type" over a string and target pointer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2359
| * | | | | | | | Fix transitive usage requirements through same-name imported targetsBrad King2018-09-1010-47/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two imported targets in different directories have the same name we should still be able to propagate transitive usage requirements from both. Fix the DAG checker to work with target pointers instead of target names since the pointers will not be duplicated even if the names are. Fixes: #18345
| * | | | | | | | genex: Simplify cmGeneratorExpressionInterpreterBrad King2018-09-079-87/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All callers were constructing with a non-empty target name using the target whose pointer was passed anyway. Drop this argument. Simplify logic accordingly. Re-order constructor arguments to match the cmCompiledGeneratorExpression::Evaluate arguments. Also remove unnecessary getters.
| * | | | | | | | Fix dependency propagation through same-name imported targetsBrad King2018-09-0712-41/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two imported targets in different directories have the same name we should still be able to propagate transitive link dependencies from both. Fix the target and link dependency analyzers to de-duplicate targets using target pointers rather than target names since the pointers will not be duplicated even if the names are. Issue: #18345
| * | | | | | | | cmLinkItem: Convert to a "sum type" over a string and target pointerBrad King2018-09-0710-66/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid exposing the item name implicitly as std::string. When the item is a target, avoid storing a second copy of its name. Most link item construction is paired with calls to `FindTargetToLink` to get the possible target pointer. Rename these methods to `ResolveLinkItem` and refactor them to construct the entire item.
* | | | | | | | | Merge branch 'release-3.12'Brad King2018-09-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'FindMPI-restore-flags-string' into release-3.12Brad King2018-09-101-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2368
| * \ \ \ \ \ \ \ \ Merge branch 'fix-ctest_start-track' into release-3.12Brad King2018-09-104-3/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2366
| * \ \ \ \ \ \ \ \ \ Merge branch 'ctest-fix-test-load' into release-3.12Brad King2018-09-1016-38/+74
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Merge-request: !2362
* | | | | | | | | | | Merge topic 'FindMPI-restore-flags-string'Brad King2018-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e374b9f1eb FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line string Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Christoph Junghans <junghans@votca.org> Reviewed-by: Christian Pfeiffer <cpfeiffer@live.de> Merge-request: !2368
| * | | | | | | | | | FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line stringBrad King2018-09-101-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.10.0-rc1~103^2~2 (FindMPI: Modernization from ground up, 2017-04-25) accidentally left this variable set as a copy of the `;`-list in `MPI_<LANG>_COMPILE_OPTIONS`, but the flags variable is documented as a command-line string. Restore it now. Fixes: #18349
* | | | | | | | | | Merge topic 'fix-ctest_start-track'Brad King2018-09-114-3/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09f0325eaf CTest: Fix regression in ctest_start() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2366
| * | | | | | | | | CTest: Fix regression in ctest_start()Kyle Edwards2018-09-104-3/+14
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The format for the TAG file was changed in 3.12, and the way it was read caused a regression which changed how the track was decided. This commit fixes the regression. Fixes #18347.
* | | | | | | | | Merge topic 'ctest-fix-test-load'Brad King2018-09-1116-38/+74
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 292ec157b6 CTest: Fix --test-load regression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2362
| * | | | | | | | CTest: Fix --test-load regressionBrad King2018-09-1016-38/+74
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ctest --test-load` option is implemented in `StartNextTests` by not starting any tests when the load is too high and instead sleeping and then returning. Prior to commit v3.11.0-rc1~117^2 (CTest: Re-implement test process handling using libuv, 2017-12-10) our outer loop in `RunTests` would immediately call `StartNextTests` again. However, now the `uv_run` loop may simply terminate if there are no tests running because no events are left pending. Fix this by converting the sleep in `StartNextTests` into a libuv timer that it starts instead. This avoids leaving `uv_run` with no pending events. In the case that there are other running tests this also allows CTest to detect when they finish even if it during the wait period where we previously slept. This regression was not caught by the test suite because it only verified that we do not start new tests when the load was too high and not that we proceed to start tests when the load drops. Revise the test suite to cover both. Fixes: #18338
* | | | | | | | Merge topic 'generator_expressions_typo_fix'Craig Scott2018-09-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3914108c4a Help: Formatting typo fix in cmake-generator-expressions(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2360
| * | | | | | | | Help: Formatting typo fix in cmake-generator-expressions(7)Raul Tambre2018-09-101-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'cmake-host-system-information-doc-fix'Craig Scott2018-09-111-4/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 228a2b0d82 Help: Clarify cmake_host_system_information memory units Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2339
| * | | | | | | | | Help: Clarify cmake_host_system_information memory unitsTaylor Holberton2018-09-101-4/+8
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memory size query implementations report in units of one mebibyte (2^20). Clarify the unit in the documentation because "megabyte" might also be interpreted as 10^6.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-09-111-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'FindOpenSceneGraph-debug'Brad King2018-09-102-21/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 192e552099 FindOpenSceneGraph: Fix find in Debug Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2341
| * | | | | | | | FindOpenSceneGraph: Fix find in DebugCyril Boucher2018-09-062-21/+13
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of now, it is not possible to find OpenSceneGraph in Debug because the only variable find_package_handle_standard_args is checking is ${module}_LIBRARY while the debug library is in ${module}_LIBRARY_DEBUG. The refactoring gets rid of the old behaviour to replace with a call to select_library_configurations which will populated ${module}_LIBRARY accordingly. [Modules/Findosg_functions.cmake Modules/FindOpenThreads.cmake] - Include SelectLibraryConfigurations module - Modify the name of the variable that will be populated by the first find_library to ${MODULE}_LIBRARY_RELEASE so that SelectLibraryConfigurations can act on it - Add call to select_library_configurations after attempting to find libraries in debug and release
* | | | | | | | Merge topic 'gicv-stdstring'Brad King2018-09-103-12/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46855d000f cmCacheManager::GetInitializedCacheValue(): Return as const std::string* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2357
| * | | | | | | | cmCacheManager::GetInitializedCacheValue(): Return as const std::string*Vitaly Stakhovsky2018-09-063-12/+15
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Expose std::string type used internally instead of const char*
* | | | | | | | Merge topic 'FindSubversion-wc-info-error'Brad King2018-09-102-12/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68d015fc94 FindSubversion: Add Subversion_WC_INFO option to suppress failures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2292
| * | | | | | | | FindSubversion: Add Subversion_WC_INFO option to suppress failuresJason Heeris2018-09-072-12/+27
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subversion fails when the directory is not actually under its control. Allow projects to tolerate this case optionally. Fixes: #18264