summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmState::GetInitializedCacheValue: Return as const std::string*Vitaly Stakhovsky2018-09-109-66/+64
|
* 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
* | | Merge topic 'extra-generator-split-arg1'Brad King2018-09-101-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0239b586bd Extra Generator: Fix handling of CMAKE_<LANG>_COMPILER_ARG1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2352
| * | | Extra Generator: Fix handling of CMAKE_<LANG>_COMPILER_ARG1Adam Oleksy2018-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | The "arg1" value is a command-line string so we must parse it to get separate arguments for `execute_process`.
* | | | CMake Nightly Date StampKitware Robot2018-09-101-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-09-091-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-09-081-1/+1
| | | |
* | | | Merge topic 'ExternalProject-check-explicit-include'Craig Scott2018-09-078-0/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df1ddeec12 ExternalProject: Report error if local variables are not defined Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !2281
| * | | | ExternalProject: Report error if local variables are not definedJean-Christophe Fillion-Robin2018-09-068-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since in some situations, ExternalProject module may be included in a sub-directory, functions will be available in the global scope but local variables like "_ep_keywords_<keyword>" will not be defined, this commit checks and reports an error indicating that the ExternalProject module must be explicitly included before using any of the ExternalProject_* functions that require the module's inclusion within the current scope or above. Co-authored-by: Pablo Hernandez <pablo.hernandez@kitware.com> Co-authored-by: Craig Scott <craig.scott@crascit.com>
* | | | | Merge topic 'definitions-get'Brad King2018-09-077-19/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 437d0c16c7 cmStateSnapshot::GetDefinition(): Return std::string const* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2356
| * | | | | cmStateSnapshot::GetDefinition(): Return std::string const*Vitaly Stakhovsky2018-09-067-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | Expose std::string type used internally in cmDefinitions instead of const char*
* | | | | | Merge branch 'release-3.12'Brad King2018-09-070-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.12.2v3.12.2Brad King2018-09-071-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-09-071-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'CMakeFindBinUtils-fix-not-cached'Brad King2018-09-061-3/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53bae4cc5e CMakeFindBinUtils: Fix use with non-cached tool settings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2355
| * | | | | | CMakeFindBinUtils: Fix use with non-cached tool settingsBrad King2018-09-051-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project or toolchain file hard-codes a tool location such as `CMAKE_LINKER` with a plain `set()` then the value will be stored in compiler information files but not cached. If the value is not cached then we should not mark it as advanced because doing so will initialize an empty cache entry. Fixes: #18315
* | | | | | | Merge branch 'release-3.12'Brad King2018-09-060-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12Brad King2018-09-051-15/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2354
* | \ \ \ \ \ \ Merge topic 'FindMatlab-no-CMAKE_CL_64'Brad King2018-09-061-15/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe883af60 FindMatlab: Remove erroneous duplicate code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2354
| * | | | | | | FindMatlab: Remove erroneous duplicate codeRaffi Enficiaud2018-09-051-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was left accidentally when resolving merge conflicts between previous changes. Fixes: #18221
* | | | | | | | Merge topic 'grd-stdstring'Brad King2018-09-0613-23/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d89830d71 cmMakefile: Make GetRequiredDefinition return std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2347
| * | | | | | | | cmMakefile: Make GetRequiredDefinition return std::stringVitaly Stakhovsky2018-09-0513-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all cases the return value is converted to std::string anyway. Also remove unnecessary `c_str()` calls in arguments to `GetRequiredDefinition`.
* | | | | | | | | Merge topic 'isonoff-cstr'Brad King2018-09-0624-43/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f16be6a62 Remove unnecessary c_str() calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2346
| * | | | | | | | | Remove unnecessary c_str() callsVitaly Stakhovsky2018-09-0524-43/+40
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new IsOn(),IsOff() overloads.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-09-061-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'cmake-gui-align-text'Brad King2018-09-051-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13a2751ca6 cmake-gui: Align source and binary directory path text Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2344
| * | | | | | | cmake-gui: Align source and binary directory path textZeex2018-09-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text inputs for "where is the source code" and "where to build the binaries" had different amount of left spacing, so the two paths were not aligned. This could create a feeling that you typed something wrong in the input even though the paths were identical or had a common root path.
* | | | | | | | Merge branch 'release-3.12'Brad King2018-09-050-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'vs-CMakeLists.txt' into release-3.12Brad King2018-09-051-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2349
| * \ \ \ \ \ \ \ Merge branch 'FindBoost-old-context' into release-3.12Brad King2018-09-041-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2348
* | \ \ \ \ \ \ \ \ Merge topic 'vs-CMakeLists.txt'Brad King2018-09-051-1/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b82e68f2f VS: Restore CMakeLists.txt references in each target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2349
| * | | | | | | | | VS: Restore CMakeLists.txt references in each targetBrad King2018-09-051-1/+5
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom command de-duplication added by commit v3.12.0-rc1~171^2 (VS: Generate a custom command only in the least dependent target, 2018-03-23) accidentally also applied to the `CMakeLists.txt` file reference we put in each target. This file reference comes with a custom command that has no dependencies and that is safe to run repeatedly across multiple targets (via internal stamp checking). Therefore it should be excluded from the de-duplication so that `CMakeLists.txt` references appear in all targets for human reference. Fixes: #18310
* | | | | | | | | Merge topic 'FindBoost-old-context'Brad King2018-09-051-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 9a800c12fc FindBoost: Fix context discovery for 1.60 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2348
| * | | | | | | FindBoost: Fix context discovery for 1.60 and belowIgor Kostenko2018-09-041-1/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `all.hpp` was removed in 1.68: https://github.com/boostorg/context/commit/2e37599461912cc1679f106a25456a493f7f0b27 * `fcontext.hpp` was moved to detail in 1.61: https://github.com/boostorg/context/commit/c2f0dfdf2608c1ebaa2229fa6f358fe6aa103561 Fixes: #18126
* | | | | | | CMake Nightly Date StampKitware Robot2018-09-051-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'cpack_test'Brad King2018-09-042-1/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a7e94d6f7 CPack (DEB/RPM): add test for per-component description/summmary. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2333
| * | | | | | CPack (DEB/RPM): add test for per-component description/summmary.David Faure2018-08-302-1/+20
| | | | | | |
* | | | | | | Merge topic 'cmakeServerSourcesForInterfaceLibraries'Brad King2018-09-043-40/+191
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d74c2282ea cmake-server: Support codemodel filegroups for INTERFACE_SOURCES Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Tobias Hunger <tobias.hunger@gmail.com> Acked-by: Markus Enzenberger <markus.enzenberger@gmail.com> Merge-request: !2282
| * | | | | | | cmake-server: Support codemodel filegroups for INTERFACE_SOURCESJustin Goshi2018-08-303-40/+191
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change returns information for INTERFACE_SOURCES. We add a flag to the filegroup to indicate if the target represents interface sources. Protocol version is updated to 1.3 since this is a change to what was released in cmake version 3.12.
* | | | | | | Merge topic 'improve-isonoff'Brad King2018-09-042-35/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bfe6991ff cmSystemTools: Re-implement IsOn,IsOff with manual branching 1fa0f2bd03 cmSystemTools: Add IsOn(),IsOff() overloads accepting std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2336
| * | | | | | | cmSystemTools: Re-implement IsOn,IsOff with manual branchingBrad King2018-08-311-35/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace use of std::string allocation, std::set lookups, and toupper conversions with explicit manual logic to do case-insensitive recognition of a specific set of strings.
| * | | | | | | cmSystemTools: Add IsOn(),IsOff() overloads accepting std::stringVitaly Stakhovsky2018-08-312-0/+12
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-09-041-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-09-031-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-09-021-1/+1
| | | | | |