summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPkgConfig-module-name'Brad King2019-09-034-0/+42
|\ | | | | | | | | | | | | fe68387695 FindPkgConfig: return the module found by pkg_search_module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3749
| * FindPkgConfig: return the module found by pkg_search_moduleChristophe Giboudeaux2019-08-294-0/+42
| | | | | | | | | | | | | | | | | | | | When running `pkg_search_module`, it may be useful to get the matching module name in order to run `pkg_get_variable`. `pkg_search_module` now defines `<prefix>_MODULE_NAME` which contains the first matching module name. Fixes: #19648
* | Merge topic 'cpack-install-multiple-configurations'Brad King2019-09-038-24/+84
|\ \ | | | | | | | | | | | | | | | | | | | | | da5ac4bb60 cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable d4e6b2ae25 Refactor: Use `unique_ptr` instead of raw pointer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3533
| * | cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variableAlex Turbov2019-08-308-20/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | For the multi-configuration generators one can specify the list of configurations to include in the package. E.g. having a project, where debug libraries have a suffix to distinct them from the release builds, one can build the package containing both `Debug` and `Release` binaries.
| * | Refactor: Use `unique_ptr` instead of raw pointerAlex Turbov2019-08-191-5/+3
| | |
* | | Merge topic 'xcode11-swift'Brad King2019-09-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5c028c27eb Xcode: Relax swift compiler detection regex for Xcode 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3758
| * | | Xcode: Relax swift compiler detection regex for Xcode 11Gregor Jasny2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 11 output: ``` CompileSwift normal x86_64 /Users/gregorj/Git/cmake/_build_xcode/Tests/SwiftOnly/CMakeFiles/3.15.20190826-g89479bd/CompilerIdSwift/CompilerId/main.swift (in target 'CompilerIdSwift' from project 'CompilerIdSwift') cd /Users/gregorj/Git/cmake/_build_xcode/Tests/SwiftOnly/CMakeFiles/3.15.20190826-g89479bd/CompilerIdSwift /Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift -frontend -c -primary-file /Users/gregorj/Git/cmake/_build_xcode/Tests/SwiftOnly/CMakeFiles/3.15.20190826-g89479bd/CompilerIdSwift/CompilerId/main.swift ... ``` The Xcode 10 output: ``` CompileSwiftSources normal x86_64 com.apple.xcode.tools.swift.compiler cd /Users/gjasny/src/cmake/Tests/SwiftOnly /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -incremental -module-name SwiftOnly -O -enable-batch-mode -enforce-exclusivity=checked -swift-version 5.0 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -target x86_64-apple-macosx10.14 -g -Xfrontend -serialize-debugging-options -swift-version 5 -Xlinker -rpath -Xlinker /usr/lib/swift -I /Users/gjasny/src/cmake/_build_xcode/Tests/SwiftOnly/Debug -F /Users/gjasny/src/cmake/_build_xcode/Tests/SwiftOnly/Debug -c -j24 /Users/gjasny/src/cmake/Tests/SwiftOnly/main.swift ... CompileSwift normal x86_64 /Users/gjasny/src/cmake/Tests/SwiftOnly/main.swift cd /Users/gjasny/src/cmake/Tests/SwiftOnly /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift -frontend -c -primary-file /Users/gjasny/src/cmake/Tests/SwiftOnly/main.swift ... ``` The Xcode 11 output lacks the CompileSwiftSources action but the CompileSwift action is present for both and also look suitable.
* | | | Merge branch 'release-3.15'Brad King2019-09-030-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'FindBoost-1.71' into release-3.15Brad King2019-08-302-18/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3763
| * \ \ \ \ Merge branch 'fileapi-CMP0037-OLD' into release-3.15Brad King2019-08-301-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3760
* | \ \ \ \ \ Merge topic 'FindBoost-1.71'Brad King2019-09-032-18/+36
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7828577065 FindBoost: Add support for Boost 1.71 cf29fa18c8 FindBoost: Unwrap compatibility INTERFACE targets for legacy variables d7df3cd73f FindBoost: Remove incorrect 1.70 timer dependency 8ff43de1a5 FindBoost: Simplify conditional block for last known version Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Dennis Klein <d.klein@gsi.de> Merge-request: !3763
| * | | | | | FindBoost: Add support for Boost 1.71Brad King2019-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.71.0 sources to compute dependencies. They are the same as Boost 1.70. Fixes: #19658
| * | | | | | FindBoost: Unwrap compatibility INTERFACE targets for legacy variablesBrad King2019-08-302-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0dd6772a89 (FindBoost: Add legacy variables and targets for compatibility, 2019-06-14, v3.15.0-rc2~3^2~1) we extract information from imported targets provided by upstream `BoostConfig.cmake` files. However, upstream Boost 1.71 provides some imported targets only for compatibility. They are just INTERFACE libraries that wrap around the real target named by `INTERFACE_LINK_LIBRARIES`. Unwrap this layer so we can extract the real imported location. Fixes: #19656
| * | | | | | FindBoost: Remove incorrect 1.70 timer dependencyBrad King2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.70.0 sources shows that the `timer` component no longer depends on `system`. This is consistent with upstream Boost Timer commit `43eecbd071`.
| * | | | | | FindBoost: Simplify conditional block for last known versionBrad King2019-08-301-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A version newer than we know about will be large enough to enter the block for the last known version so we can put the warning there.
* | | | | | | Merge topic 'fileapi-CMP0037-OLD'Brad King2019-09-031-0/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9da1c33cf1 fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3760
| * | | | | | fileapi: Fix codemodel v2 target file name for CMP0037 OLD behaviorBrad King2019-08-301-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With CMP0037 OLD behavior, executable and library target names may contain a slash. Avoid constructing file names with slashes. Fixes: #19653
* | | | | | CMake Nightly Date StampKitware Robot2019-09-031-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-09-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-09-011-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-08-311-1/+1
| | | | | |
* | | | | | Merge topic 'doc-contrib-topic-name'Brad King2019-08-301-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2fa3361384 CONTRIBUTING: Clarify creation of topic branch from target branch Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !3761
| * | | | | | CONTRIBUTING: Clarify creation of topic branch from target branchBrad King2019-08-301-2/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sentence "Base all new work on the upstream master branch." may be interpreted to mean that one should commit on a 'master' branch. Precede this with an explicit step for creating a topic branch.
* | | | | | Merge topic 'rel-nightly-test'Brad King2019-08-301-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c71208a78 Tests: Fix nightly binary tests to fail on error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3755
| * | | | | | Tests: Fix nightly binary tests to fail on errorBrad King2019-08-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We generate a small shell script to drive the steps. Previously a failure in the `release_cmake.cmake` script was not diagnosed and hidden from the script exit code by the following upload step. Tell the shell to terminate with failure on the first command that fails.
* | | | | | | Merge topic 'remove_directory-symlink'Brad King2019-08-306-4/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6c9a8bac3 cmake: Teach -E remove_directory to remove directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3738
| * | | | | | | cmake: Teach -E remove_directory to remove directory symlinksJon Chronopoulos2019-08-306-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the argument to `remove_directory` is a symlink to a directory, remove the symlink instead. Issue: #19533
* | | | | | | | Merge topic 'update-kwsys'Brad King2019-08-303-132/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys f9a3f13415 KWSys 2019-08-29 (08f14d96) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3754
| * \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-08-293-132/+82
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2019-08-29 (08f14d96)
| | * | | | | | | KWSys 2019-08-29 (08f14d96)KWSys Upstream2019-08-293-132/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 08f14d96b449e5d1e166998b363da16167a3ac82 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 9afecb09 SystemTools: fix typo in junction functions Jon Chronopoulos (1): 38486236 SystemTools: do not special case a junction in RemoveFile Rolf Eike Beer (3): b747462d CMake: drop needless x${VAR} tricks 1ed70242 tests: verify SystemTools::CopyFileIfDifferent() f73d1b4f SystemTools: factor out "dest is directory" case from CopyFileIfDifferent()
* | | | | | | | | Merge topic 'docker-rel-linux'Brad King2019-08-302-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c95c35c51 Utilities/Release: Add docker spec for STGZ package on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3753
| * | | | | | | | Utilities/Release: Add docker spec for STGZ package on LinuxBrad King2019-08-292-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec added by commit facc240a45 (Utilities/Release: Add docker specs to build and test Linux binaries, 2019-08-23) generates only the TGZ package, but the old `Utilities/Release/linux64_release.cmake` script also generated a STGZ package.
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-08-301-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'per-lang-link-library-flag'Brad King2019-08-295-8/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79b2824251 Add per-lang variants of CMAKE_LINK_LIBRARY_{FILE_FLAG,SUFFIX} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3747
| * | | | | | | | Add per-lang variants of CMAKE_LINK_LIBRARY_{FILE_FLAG,SUFFIX}Alan W. Irwin2019-08-275-8/+36
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit 689be6235e (Generator: support per-language link library flag, 2019-08-08) to cover more link library command-line flag components. Allow compilers for different languages to use different values for these linking-related variables within the same build. Closes: #19631
* | | | | | | | Merge topic 'CMakeParseImplicitLinkInfo-comma-separated'Brad King2019-08-29193-9/+606
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5f20da94d CMakeParseImplicitLinkInfo supports comma separated link lines 2200bc068b Introduce a ParseImplicitLinkInfo test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3730
| * | | | | | | | CMakeParseImplicitLinkInfo supports comma separated link linesRobert Maynard2019-08-289-6/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is currently presumed that the linker will generate a space separated line. This is not the case for some compilers such as IBM XL where it can output space or comma separated. This is particularly apparent when IBM XL is used as the host compiler for CUDA as it generates a comma separated link line.
| * | | | | | | | Introduce a ParseImplicitLinkInfo testRobert Maynard2019-08-28186-8/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By sharing the information used by ParseImplicitIncludeInfo we can also verify the parsing of implicit link info such as directories.
* | | | | | | | | Merge topic 'precompile-headers'Brad King2019-08-2963-6/+924
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8da78d4efe Precompile headers: Update documentation 5772930164 Precompile headers: Add unit tests 519606704e Precompile headers: Add support for Visual Studio generators 28be170fbc Precompile headers: Add support for Xcode generator b8626261e9 Precompile headers: Add methods to generate PCH sources 375d01c680 PCH: add example/test 9b6797e71d PCH: add target_precompile_headers command 0467a2f91b PCH: add PRECOMPILE_HEADERS to special properties Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Acked-by: Ivan171 <heavenandhell171@gmail.com> Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com> Acked-by: Steve Mokris <smokris@softpixel.com> Acked-by: Evgeniy Dushistov <dushistov@mail.ru> Acked-by: Danila Malyutin <flashmozzg@gmail.com> Acked-by: Viktor Kirilov <vik.kirilov@gmail.com> Acked-by: Lucas Zhao <zhaopf6@163.com> Merge-request: !3553
| * | | | | | | | | Precompile headers: Update documentationCristian Adam2019-08-2810-0/+121
| | | | | | | | | |
| * | | | | | | | | Precompile headers: Add unit testsCristian Adam2019-08-2823-1/+254
| | | | | | | | | |
| * | | | | | | | | Precompile headers: Add support for Visual Studio generatorsCristian Adam2019-08-283-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with Visual C++ 2017 on Windows. Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
| * | | | | | | | | Precompile headers: Add support for Xcode generatorCristian Adam2019-08-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
| * | | | | | | | | Precompile headers: Add methods to generate PCH sourcesCristian Adam2019-08-2817-4/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
| * | | | | | | | | PCH: add example/testDaniel Pfeifer2019-08-275-0/+45
| | | | | | | | | |
| * | | | | | | | | PCH: add target_precompile_headers commandDaniel Pfeifer2019-08-275-0/+84
| | | | | | | | | |
| * | | | | | | | | PCH: add PRECOMPILE_HEADERS to special propertiesDaniel Pfeifer2019-08-266-1/+106
| | | | | | | | | |
* | | | | | | | | | Merge topic 'autogen_strcat'Brad King2019-08-299-573/+450
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32b15d320f Autogen: cmQtAutoMocUic settings hash computation optimizations b66cd3fe63 Autogen: cmQtAutoMocUic string concatenation cleanups 619a92eacd Autogen: cmQtAutoRcc settings hash computation optimizations 10dc684508 Autogen: cmQtAutoRcc string concatenation cleanups da6c4b1273 Autogen: cmQtAutoGenInitializer string concatenation cleanups 7a78d15415 Autogen: Let cmQtAutoGenerator::Logger methods accept cm::string_view c797148e85 Autogen: Use cm::string_view for AUTO{MOC,UIC,RCC} generator names 8586077baa Autogen: Modernize cmQtAutoGen methods using cm::string_view Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3742
| * | | | | | | | | Autogen: cmQtAutoMocUic settings hash computation optimizationsSebastian Holtermann2019-08-271-15/+9
| | | | | | | | | |
| * | | | | | | | | Autogen: cmQtAutoMocUic string concatenation cleanupsSebastian Holtermann2019-08-272-265/+225
| | | | | | | | | |