summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Add CMAKE_AUTOGEN_VERBOSE variable supportSebastian Holtermann2018-06-216-8/+44
| | | | | Setting CMAKE_AUTOGEN_VERBOSE enables verbose output during AUTOMOC, AUTOUIC and AUTORCC generation.
* Merge topic 'LINK_OPTIONS'Brad King2018-06-211-0/+1
|\ | | | | | | | | | | | | b16fd1341d Help: add_library(INTERFACE): add reference to add_link_options() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2160
| * Help: add_library(INTERFACE): add reference to add_link_options()Marc Chevrier2018-06-201-0/+1
| |
* | CMake Nightly Date StampKitware Robot2018-06-211-1/+1
| |
* | Merge branch 'release-3.12'Brad King2018-06-200-0/+0
|\ \
| * \ Merge branch 'vs-cuda-no-host-includes' into release-3.12Brad King2018-06-201-0/+1
| |\ \ | | | | | | | | | | | | Merge-request: !2158
| * \ \ Merge branch 'vs-cuda-maxrregcount' into release-3.12Brad King2018-06-201-0/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2156
| * \ \ \ Merge branch 'xcode-10-legacy-build-system' into release-3.12Brad King2018-06-196-29/+49
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2151
* | \ \ \ \ Merge topic 'vs-cuda-no-host-includes'Brad King2018-06-201-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 543b6826ee VS: Avoid duplication of CUDA include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2158
| * | | | | VS: Avoid duplication of CUDA include directoriesBrad King2018-06-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already place all include directories for CUDA inside `CudaCompile` so we do not need to use any from `ClCompile`. Tell `CudaCompile` not to use the host compiler's include directory settings. Fixes: #18101
* | | | | | Merge topic 'vs-cuda-maxrregcount'Brad King2018-06-201-0/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d3a3d7459 VS: Add CUDA flag table entry for -maxrregcount Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2156
| * | | | | VS: Add CUDA flag table entry for -maxrregcountBrad King2018-06-201-0/+3
| |/ / / / | | | | | | | | | | | | | | | Fixes: #18104
* | | | | Merge topic 'xcode-10-legacy-build-system'Brad King2018-06-206-29/+49
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ca69206893 Tests: Do not use i386 architecture with Xcode 10 and above 71fa78ff7a Tests: Teach RunCMake to ignore Xcode missing file type warnings 057ecb8f6f C++ feature checks: Ignore Xcode warnings 985d3a162c Xcode: Use legacy build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2151
| * | | Tests: Do not use i386 architecture with Xcode 10 and aboveBrad King2018-06-192-17/+21
| | | | | | | | | | | | | | | | Xcode 10 dropped support for i386 builds.
| * | | Tests: Teach RunCMake to ignore Xcode missing file type warningsBrad King2018-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 10 beta warns xcodebuild... warning: file type '::com.apple.instruments.instrdst' is based on missing file type 'default::com.apple.package' Teach RunCMake to drop such lines before matching against expected output.
| * | | C++ feature checks: Ignore Xcode warningsGregor Jasny2018-06-191-0/+2
| | | |
| * | | Xcode: Use legacy build systemGregor Jasny2018-06-192-12/+25
| | | | | | | | | | | | | | | | Closes: #18099
* | | | CMake Nightly Date StampKitware Robot2018-06-201-1/+1
| | | |
* | | | Merge topic 'install_from_another_directory'Brad King2018-06-198-3/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e89ad0f94e install: Allow installing targets created in another directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2152
| * | | | install: Allow installing targets created in another directoryZack Galbreath2018-06-188-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, `install(TARGETS)` would only accept targets created in the same directory scope. Relax this restriction by searching the global scope when determining whether or not a target exists. Fixes: #14444
* | | | | Merge branch 'release-3.12'Brad King2018-06-190-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'xcode-10-archs' into release-3.12Brad King2018-06-197-13/+20
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Merge-request: !2153
| * | | | Merge branch 'FindCURL-target-name' into release-3.12Brad King2018-06-192-6/+6
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | Merge-request: !2154
* | | | | Merge topic 'xcode-10-archs'Brad King2018-06-197-13/+20
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2153
| * | | | Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCHBrad King2018-06-187-13/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 10 no longer populates `CURRENT_ARCH` with the current architecture in shell scripts and instead uses `undefined_arch`. Instead we must use `ARCHS`. It lists all architectures separated by spaces. Fixes: #18085
* | | | Merge topic 'FindCURL-target-name'Brad King2018-06-192-6/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 1e356734a7 FindCURL: Rename imported target to match upstream CURL Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !2154
| * | | FindCURL: Rename imported target to match upstream CURLBrad King2018-06-182-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream CURL provides imported target `CURL::libcurl`. Rename the target added by `FindCURL` to match. We don't need compatibility with the old name because it has never been in a CMake release (except a 3.12 release candidate). Suggested-by: Jakub Zakrzewski <slither.jz@gmail.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Fixes: #18091
* | | Merge topic 'subdir_target_sources'Craig Scott2018-06-1946-4/+447
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 316815e1f4 target_sources: Interpret relative paths as relative to the calling directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2128
| * | | target_sources: Interpret relative paths as relative to the calling directoryPatrick Stotko2018-06-1846-4/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the command considered non-absolute source file paths relative to the associated target on the LHS. This causes problems in incremental builds where files are added from subdirectories and forces users to workaround by manually converting to absolute paths. Change this to enable more intuitive usage by projects. Fixes #17981
* | | | CMake Nightly Date StampKitware Robot2018-06-191-1/+1
| |_|/ |/| |
* | | Merge topic 'find_program-conditional-cwd'Brad King2018-06-185-8/+97
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c76c1ea208 find_program: Consider CWD only for paths with separator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2120
| * | | find_program: Consider CWD only for paths with separatorSam Yates2018-06-145-8/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_program() incorrectly prepended search path components to absolute file paths, and incorrectly searched the current working directory for files that contained no directory separators. * Replace calls cmFindProgramHelper::CheckDirectory(std::string()) with call of new method cmFindProgramHelper::CheckCompoundNames() that checks for the presence of a directory separator in the file name. * Use cmSystemTools::CollapseCombinedPath rather than string concatenation to properly combine absolute file names with search path components. * Add unit tests to verify corrections. Fixes: #18044
* | | | Merge topic 'update-kwsys'Brad King2018-06-184-27/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4eae1c0816 Merge branch 'upstream-KWSys' into update-kwsys f3cd44263e KWSys 2018-06-14 (2b0ca1d8) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2148
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-06-144-27/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-06-14 (2b0ca1d8)
| | * | | | KWSys 2018-06-14 (2b0ca1d8)KWSys Upstream2018-06-144-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 2b0ca1d85d6e3fcf3b3fa375783c33524629f256 (master). Upstream Shortlog ----------------- Marian Klymov (3): 0b9f51a1 Remove redundant calls to c_str 361e54e3 Get rid of redundant string initialization 61501133 SystemInformation: Avoid use of dangling pointers on Solaris
* | | | | | Merge topic 'UseSWIG-bugfixes'Brad King2018-06-185-0/+92
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08f2a2408d UseSWIG: add support of target property INCLUDE_DIRECTORIES consumption Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2141
| * | | | | | UseSWIG: add support of target property INCLUDE_DIRECTORIES consumptionMarc Chevrier2018-06-135-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18003
* | | | | | | CMake Nightly Date StampKitware Robot2018-06-181-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-06-171-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-06-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-06-151-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'list_sort'Brad King2018-06-1430-11/+391
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49a51a61d7 list: Add options to control the SORT comparison operation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2065
| * | | | | list: Add options to control the SORT comparison operationDaniel Franke2018-06-1330-11/+391
| | |_|/ / | |/| | |
* | | | | Merge branch 'release-3.11'Brad King2018-06-140-0/+0
|\ \ \ \ \
| * | | | | CMake 3.11.4v3.11.4Brad King2018-06-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-06-141-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release-3.12'Brad King2018-06-130-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'sphinx-info' into release-3.12v3.12.0-rc1Brad King2018-06-133-2/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2146
| * \ \ \ \ Merge branch 'restore-windows-resources-through-link' into release-3.12Brad King2018-06-131-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2147
| * \ \ \ \ \ Merge branch 'UseSWIG-csharp-variant' into release-3.12Brad King2018-06-136-2/+103
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2137