summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: clarify add_definitions() and add_compile_definitions() behaviorMarc Chevrier2020-05-242-7/+9
| | | | Fixes: #20736
* Merge topic 'cuda-default-runtime' into release-3.17Brad King2020-05-2212-7/+65
|\ | | | | | | | | | | | | | | | | e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4762
| * CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchainRobert Maynard2020-05-2110-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0d0145138f (CUDA: Add abstraction for cuda runtime selection, 2019-11-29, v3.17.0-rc1~83^2) we add CUDA runtime library selection flags by default. To maintain backwards compatibility the default CUDA runtime library needs to be computed based on what libraries are found on the initial compiler invocation. For example a toolchain could establish initial flags that have all CUDA compilations using the runtime version, and if we don't detect this we will try to link to both the static and shared runtime. Co-Author: Brad King <brad.king@kitware.com> Fixes: #20708
| * CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compileRobert Maynard2020-05-202-0/+4
| |
| * Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicabilityRobert Maynard2020-05-201-1/+1
| |
* | Merge topic 'FindPython-debug-library-lookup' into release-3.17Brad King2020-05-211-2/+8
|\ \ | |/ |/| | | | | | | | | 71e6854b22 FindPython: use CMAKE specific variables to look-up debug library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4764
| * FindPython: use CMAKE specific variables to look-up debug libraryMarc Chevrier2020-05-181-2/+8
| | | | | | | | Fixes: #20714
* | Merge topic 'vs-sln-version' into release-3.17Brad King2020-05-201-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 88ad02f1ec VS: Restore .sln support for VS Version Selector Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4765
| * | VS: Restore .sln support for VS Version SelectorBrad King2020-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since commit 3b51343ea1 (VS: Emit UTF-8 BOM for generated solution files, 2019-08-19, v3.16.0-rc1~237^2) the `.sln` file does not work with the VS Version Selector. Add a newline after the BOM to restore support. Fixes: #20725
* | | Merge topic 'fix-ClearSourcesCache' into release-3.17Brad King2020-05-181-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4751
| * | cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCacheBrad King2020-05-151-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | In commit 40aa6c059c (cmGeneratorTarget: Add method to collect all sources for all configs, 2017-04-10, v3.9.0-rc1~268^2~5) we forgot to update `ClearSourcesCache` to also clear `AllConfigSources`. This leads to subtle cases where code paths like PCH handling that add sources during generation break depending on ordering. Suggested-by: Christian Fersch Fixes: #20712, #20702
* | Merge topic 'backport-3.16-FindPkgConfig-isystem' into release-3.17Brad King2020-05-151-0/+6
|\ \ | | | | | | | | | | | | | | | | | | 3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4752
| * | Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fixBrad King2020-05-151-0/+6
| | | | | | | | | | | | | | | Add a release note for the change in commit 4d446c68d1 (FindPkgConfig: also handle "-isystem" prefixes for include directories, 2020-04-30).
* | | Merge branch 'release-3.16' into release-3.17Brad King2020-05-150-0/+0
|\ \ \ | |/ /
| * | Merge branch 'backport-3.16-objc-env-vars' into release-3.16Brad King2020-05-146-18/+61
| |\ \
| * \ \ Merge branch 'pch-msvc-pragma' into release-3.16Brad King2020-05-111-7/+5
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !4736
| * \ \ \ Merge branch 'vs-pch-compile-opts' into release-3.16Brad King2020-05-112-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4734
| * \ \ \ \ Merge branch 'FindGTK2-harfbuzz-target' into release-3.16Brad King2020-05-091-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4725
| * \ \ \ \ \ Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16Brad King2020-05-062-9/+63
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4693
| * \ \ \ \ \ \ Merge branch 'CheckLanguage-cuda-host' into release-3.16Brad King2020-05-052-10/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4711
| * \ \ \ \ \ \ \ Merge branch 'makefile-objc' into release-3.16Brad King2020-04-282-3/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4675
| * \ \ \ \ \ \ \ \ Merge branch 'pch-genex-absolute' into release-3.16Brad King2020-04-275-16/+19
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4678
| * \ \ \ \ \ \ \ \ \ Merge branch 'ibmi-aix-exports' into release-3.16Brad King2020-04-141-2/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4611
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'FindMPI-pgi-spectrum-mpi-wrappers' into release-3.16Brad King2020-04-141-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Merge-request: !4598
* | | | | | | | | | | | Merge topic 'objc-env-vars' into release-3.17Brad King2020-05-157-18/+65
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection 16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars 67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4746
| * | | | | | | | | | | | Help: Add 3.17.3 release note for Objective C/C++ compiler selectionBrad King2020-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port the 3.16.7 release note for 3.17.3 too.
| * | | | | | | | | | | | Merge branch 'backport-3.16-objc-env-vars' into objc-env-varsBrad King2020-05-146-18/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / | | | | | | | | | | | | _
| * | | | | | | | | | | Objective C/C++: Honor CC and CXX env vars to select compilerBrad King2020-05-145-18/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the `OBJC` or `OBJCXX` environment variable is not set to specify an Objective C or C++ compiler, check `CC` or `CXX` too. Fixes: #20703
| * | | | | | | | | | | Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilersBrad King2020-05-143-0/+24
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'fix-cache-args-file-to-dep-list' into release-3.17Brad King2020-05-138-0/+52
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
| * | | | | | | | | | | ExternalProject: expose _ep_cache_args_script to the callerBen Boeckel2020-05-128-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed so that the caller can add a dependency on the cache file. Fixes: #20668
* | | | | | | | | | | | Merge topic 'vs-pch-compile-opts' into release-3.17Brad King2020-05-122-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
| * | | | | | | | | | | VS: Fix using PCH from source with COMPILE_OPTIONSBrad King2020-05-112-1/+4
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a source file gets per-source flags from both PCH and custom `COMPILE_OPTIONS`, combine them correctly. Fixes: #20694, #20456
* | | | | | | | | | | Merge topic 'pch-msvc-pragma' into release-3.17Brad King2020-05-121-7/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4736
| * | | | | | | | | | MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and aboveBrad King2020-05-111-7/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 15.6 introduced support for this pragma. Older MSVC versions warn that it is unknown. Fixes: #20692
* | | | | | | | | | Merge topic 'xl-cpp-install' into release-3.17Brad King2020-05-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4735
| * | | | | | | | | | XL: Install our Fortran 'cpp' helper script with execute permissionBrad King2020-05-111-1/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script was added by commit 19f267c75e (XL: Add support for Ninja and XL Fortran, 2019-11-21, v3.17.0-rc1~368^2) but does not have a `.sh` extension so our existing install rules neglect to give it execute permission. Our test suite works on XL Fortran in the build tree but the script is broken without execute permission on installation. Fixes: #20695
* | | | | | | | | | Merge topic 'FindGTK2-harfbuzz-target' into release-3.17Brad King2020-05-111-3/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4725
| * | | | | | | | | FindGTK2: Add harfbuzz target for dependency from pangoBrad King2020-05-091-3/+6
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS, 2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES` variables. Add the `GTK2::harfbuzz` imported target and update the `GTK2::pango` target to depend on it. Issue: #19531
* | | | | | | | | Merge branch 'backport-3.17-FindPython-check-specified-version' into ↵Brad King2020-05-083-43/+222
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.17 Merge-request: !4718
| * | | | | | | | | FindPython: ensure any specified version is correctly handledMarc Chevrier2020-05-073-43/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20674
* | | | | | | | | | Merge topic 'pch-reuse-multi' into release-3.17Brad King2020-05-081-1/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1c7736cb PCH: Fix REUSE_FROM in multi-config generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4717
| * | | | | | | | | PCH: Fix REUSE_FROM in multi-config generatorsAndreas Schönle2020-05-071-1/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a55df20499 (Multi-Ninja: Add precompile headers support, 2020-01-10, v3.17.0-rc1~136^2) the re-used PCH file object is added once for each configuration to flags used for all configurations. Put it in the flags for only the corresponding configuration instead. Fixes: #20680
* | | | | | | | | Merge topic 'FindPkgConfig-isystem' into release-3.17Brad King2020-05-063-9/+72
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem' 4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4693
| * | | | | | | | | Help: Add 3.17 release note for FindPkgConfig '-isystem' fixBrad King2020-05-061-0/+9
| | | | | | | | | |
| * | | | | | | | | Merge branch 'backport-3.16-FindPkgConfig-isystem'Brad King2020-05-062-9/+63
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | FindPkgConfig: also handle "-isystem" prefixes for include directoriesRolf Eike Beer2020-05-052-9/+63
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20652
* | | | | | | | Merge topic 'CheckLanguage-cuda-host' into release-3.17Brad King2020-05-062-10/+10
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4711
| * | | | | | | CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILERBrad King2020-05-052-10/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the condition added by commit fada8cbfd6 (CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation, 2019-05-31, v3.15.0-rc1~12^2) to activate CUDA-specific logic. The old condition had worked in our test suite only by accident because the loop variable used in the test happened to be the name and value that the old condition used! Update the test to use a different name. Fixes: #19013
* | | | | | | Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-05-051-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Boris Basic <baljci@hotmail.com> Merge-request: !4706
generated by cgit v0.12 at 2025-02-05 03:19:20 (GMT)