mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 14:48:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,611 Commits 2 Branches 401 Tags
da25220d83c25ceabad09b8386fb004b53400bd4
Commit Graph

10357 Commits

Author SHA1 Message Date
Brad King da25220d83 Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysroots 2020-04-08 13:44:42 -04:00
Brad King 45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS 
Use `<arch>-SDK-NOTFOUND` instead of an empty string as a placeholder in
`CMAKE_APPLE_ARCH_SYSROOTS` for architectures whose SDK is not found.
This ensures the length of `CMAKE_APPLE_ARCH_SYSROOTS` matches the
length of `CMAKE_OSX_ARCHITECTURES`.  It also makes the missing SDKs
more visible in the value.

Issue: #20534
 2020-04-08 11:51:02 -04:00
Brad King c0438d272d Merge topic 'llvm-rc-include-path' 
35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4570
 2020-04-07 08:00:45 -04:00
Brad King 3d61ff7b10 Merge topic 'llvm-rc-include-path' into release-3.17 
35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4570
 2020-04-07 08:00:44 -04:00
Brad King a4c873fc5d Merge topic 'UseJava-clean-stale' 
4559eb490a UseJava: clean class files from previous builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Merge-request: !4381
 2020-04-07 07:58:30 -04:00
Thomas Bernard 35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing 
Since commit 1c2d031cbd (Add -E cmake_llvm_rc to preprocess files for
llvm-rc, 2020-01-14, v3.17.0-rc1~24^2) with llvm-rc we explicitly
preprocess RC source files and then compile separately without -I flags.
This broke cases where the RC source references data files adjacent to
itself or in the include path.

This change adds the expansion of the include paths when calling the
llvm-rc in order for the resource files to be picked up correctly by
llvm-rc.  Since the RC compiled file is first preprocessed, the file
being compiled by llvm-rc resides in the build directory. In order for
llvm-rc to find the resource data specified relative to the .rc file
being compiled, the source file path is preppended in the include list
so that the original source path takes priority over all the other
includes paths specified.

A space was added in the CMAKE_INCLUDE_FLAG_RC to make the include
directive work properly for llvm-rc. Checks on the rc.exe showed that
the syntax change doesn't affect it's proper operation.

Fixes: #20529
 2020-04-06 21:19:12 +02:00
Alexey Karndshev 4559eb490a UseJava: clean class files from previous builds 
If java_class_filelist exists, remove previous class files before building the
new ones. If java_sources content has changed, clean and rebuild the class
files of the target.

Fixes: #20377
 2020-04-06 16:58:10 +02:00
Brad King c18c781cb5 Merge topic 'externalproject-patch-update-order' 
7249ba9677 ExternalProject: Enforce that patch depends on update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4565
 2020-04-06 08:30:04 -04:00
Craig Scott 7249ba9677 ExternalProject: Enforce that patch depends on update 
Fixes: #17229
 2020-04-03 22:48:44 +11:00
Craig Scott 0331092ce6 FetchContent: Add support for DOWNLOAD_NO_EXTRACT 
Fixes: #20526
 2020-04-03 22:05:55 +11:00
Brad King 11998c63fd Merge topic 'ExternalProject-no-extract-bool' into release-3.17 
2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4562
 2020-04-03 06:58:22 -04:00
Brad King e141c9dc15 Merge topic 'ExternalProject-no-extract-bool' 
2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4562
 2020-04-03 06:58:22 -04:00
Brad King d26f15dfce Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.17 
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
 2020-04-02 11:12:54 -04:00
Brad King 35d9ca268b Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' 
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
 2020-04-02 11:12:54 -04:00
Ben Boeckel 2c4bb705e8 ExternalProject: allow DOWNLOAD_NO_EXTRACT OFF 
Fixes: #20531
 2020-04-02 08:55:04 -04:00
Brad King f9be12707f Merge topic 'relax_compiler_prefix_detection' 
c5dd2ca538 DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4547
 2020-04-01 10:53:46 -04:00
Brad King 85f87c9d40 Merge topic 'xl-cxx14' 
46d9006efa XL: Add comment clarifying why we pretend it has full C++11/14 support
4aaa9ea96c XL: C++14 language level flags are only available on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4551
 2020-04-01 10:42:19 -04:00
Brad King 9b32801859 Merge topic 'xl-cxx14' into release-3.17 
46d9006efa XL: Add comment clarifying why we pretend it has full C++11/14 support
4aaa9ea96c XL: C++14 language level flags are only available on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4551
 2020-04-01 10:42:18 -04:00
Marc Chevrier 81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST 
Fixes: #20525
 2020-04-01 10:36:46 -04:00
Brad King 46d9006efa XL: Add comment clarifying why we pretend it has full C++11/14 support 
Since commit b0f46c48f6 (CompileFeatures: Now able to presume full
language level support, 2019-03-06, v3.15.0-rc1~265^2~1) we pretend that
the XL compiler has full C++11 and C++14 support so that projects
specifying granular features will at least get the corresponding
compiler mode.  This is a work around for our lack of a full feature
check table for this compiler that works in common cases.  Add a comment
explaining this.

Issue: #20521
 2020-03-31 10:35:56 -04:00
Brad King 4aaa9ea96c XL: C++14 language level flags are only available on Linux 
Since commit 458ea9d76c (XL: Add C++14 language level flags, 2019-04-15,
v3.15.0-rc1~226^2) we use `-qlanglvl=extended1y` for C++14 with XL 16.1.
However, that flag is only supported on a Linux host.

Issue: #20521
 2020-03-31 10:35:56 -04:00
Brad King 0f66cb6b22 Merge topic 'FindBoost-lib-prefix-override' 
ff71612d02 FindBoost: Allow Boost_LIB_PREFIX to be set externally

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4531
 2020-03-31 09:23:13 -04:00
Robert Maynard c5dd2ca538 DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection 
Now detect _CMAKE_TOOLCHAIN_PREFIX whenever a compilers
name matches the heuristics, instead of only doing it
when cross compiling
 2020-03-30 17:08:01 -04:00
Brad King 615950dfb6 Merge topic 'cuda_support_bin_util_overrides' 
79b6e928c3 CUDA: Support compiler specific FindBinUtils overrides

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !4539
 2020-03-30 13:29:36 -04:00
Brad King cfa3a2342f Merge topic 'gtest_discover_tests_cross_compile_support' 
3b4838b57f GoogleTest: Add tests for MultiConfig discovery in PRE_TEST mode
1ba4cb565e GoogleTest: Parameterize tests to check PRE_TEST/POST_BUILD discovery mode
75e82a13db GoogleTest: Add new DISCOVERY_MODE option to gtest_discover_tests
889a7146ff GoogleTestAddTests: Refactor into callable method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4078
 2020-03-30 13:26:49 -04:00
Brad King e20146b429 Merge topic 'FindBoost-lib-prefix-clarify' 
040f503d83 FindBoost: Clarify logic selecting Boost_LIB_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4537
 2020-03-30 13:24:38 -04:00
Brad King 42cefc6bc1 Merge topic 'llvm_rc_pp' into release-3.17 
4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4535
 2020-03-30 13:22:02 -04:00
Brad King 0188df97e8 Merge topic 'llvm_rc_pp' 
4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4535
 2020-03-30 13:22:02 -04:00
Marc Chevrier dd0664415a FindPython: use 'sysconfig' as alternate to 'distutils.sysconfig' 
To support any python installation, if package 'distutils.sysconfig'
is not available, try to use package 'sysconfig'.

Fixes: #20502
 2020-03-28 10:51:47 +01:00
Robert Maynard 79b6e928c3 CUDA: Support compiler specific FindBinUtils overrides 2020-03-27 12:58:01 -04:00
Bartlomiej Cieszkowski ff71612d02 FindBoost: Allow Boost_LIB_PREFIX to be set externally 
On platforms where our default Boost static library prefix is incorrect,
make it possible for users to set it explicitly to work around the problem
until FindBoost can be updated.

Fixes: #20372
 2020-03-27 09:48:22 -04:00
Brad King 040f503d83 FindBoost: Clarify logic selecting Boost_LIB_PREFIX 
Also add a comment explaining its purpose.
 2020-03-27 09:32:47 -04:00
Lucas Wang 4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path 
`CMAKE_RC_COMPILER_INIT` and `CMAKE_RC_COMPILER` can be set by user,
for example `llvm-rc-10` and `D:\LLVM\bin\llvm-rc.exe`.
 2020-03-27 08:54:58 -04:00
Brad King f670435715 Merge topic 'pch-warn-invalid' 
2ce08e5489 PCH: add an option to disable `-Winvalid-pch`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4499
 2020-03-27 08:03:30 -04:00
Brad King efb2a9f093 Merge topic 'vs-clangcl' into release-3.17 
f3d7a15010 VS: Fix ClangCL toolset compiler path detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4523
 2020-03-27 07:45:15 -04:00
Brad King 112cb248ae Merge topic 'vs-clangcl' 
f3d7a15010 VS: Fix ClangCL toolset compiler path detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4523
 2020-03-27 07:45:15 -04:00
Brad King 311848f790 Merge topic 'FindPython-variable-spelling-error' into release-3.17 
63580668a8 FindPython: fix variable spelling error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4529
 2020-03-27 07:44:12 -04:00
Brad King 83f5ba06df Merge topic 'FindPython-variable-spelling-error' 
63580668a8 FindPython: fix variable spelling error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4529
 2020-03-27 07:44:12 -04:00
Brad King 9df587168a Merge topic 'CheckIPOSupported-cleanup-cache' 
4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4528
 2020-03-27 07:43:03 -04:00
Brad King f6c3820549 Merge topic 'CheckIPOSupported-cleanup-cache' into release-3.17 
4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4528
 2020-03-27 07:43:02 -04:00
Brad King 184dd23d2e Merge topic 'nmc-cl-showincludes' 
6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4526
 2020-03-27 07:41:58 -04:00
Brad King 1915a09884 Merge topic 'nmc-cl-showincludes' into release-3.17 
6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4526
 2020-03-27 07:41:57 -04:00
Brad King 032df7ae7b Merge topic 'llvm-rc-depfile' into release-3.17 
2c724c3aea llvm-rc: Write depfile to location specified by the generator
4cc876540e llvm-rc: Select preprocessor from active languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4524
 2020-03-27 07:38:22 -04:00
Brad King ab96bbff2c Merge topic 'llvm-rc-depfile' 
2c724c3aea llvm-rc: Write depfile to location specified by the generator
4cc876540e llvm-rc: Select preprocessor from active languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4524
 2020-03-27 07:38:22 -04:00
Marc Chevrier 63580668a8 FindPython: fix variable spelling error 2020-03-26 18:08:25 +01:00
Brad King 4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result' 
Fixes: #20508
 2020-03-26 12:57:07 -04:00
Cristian Adam 2ce08e5489 PCH: add an option to disable -Winvalid-pch 
Fixes: #20295
 2020-03-26 14:24:46 +01:00
Brad King 6257d43ffd Merge topic 'compile-commands-collapse-whitespace' 
e565053bce Ninja: Remove unnecessary newlines in compile commands
5d4bab500e Avoid consecutive whitespace in rules
d8622fbd0f Modules: Collapse consecutive whitespace in strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4512
 2020-03-26 09:13:45 -04:00
Brad King 545875bebe Merge topic 'mingw-windres-cross-compile' 
af4adf6aa9 MinGW: Fix default windres selection when cross-compiling
0251ddadab MinGW: Drop unnecessary windres selection code with Unix Makefiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4520
 2020-03-26 09:06:13 -04:00
Brad King 6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection 
Activate the detection logic for this generator too.

Fixes: #20506
 2020-03-26 08:47:36 -04:00