mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,587 Commits 2 Branches 401 Tags
5e212cafba0f2266510841eea3f5c7b79fde9449
Commit Graph

49587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 5e212cafba Merge topic 'osx_asm_architectures' 
940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5152
 2020-08-25 10:40:20 -04:00
Brad King f035ddec4f Merge topic 'win32-executable-genex' 
3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5146
 2020-08-25 10:33:00 -04:00
Brad King ea67dbc4cd Merge topic 'file_generate_target' 
27a912193b file(GENERATE): Add TARGET argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5131
 2020-08-25 10:31:02 -04:00
Brad King 0b0dc86eab Merge topic 'unk_imported_location' 
359c500a24 cmTarget: Raise error if imported target location is not set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5113
 2020-08-25 10:30:14 -04:00
Brad King a65f95bb65 Merge topic 'update-curl' 
387ea71853 curl: Set build options the way we need for CMake
7d0fa4a943 Merge branch 'upstream-curl' into update-curl
7ceb56989f curl 2020-08-19 (9d954e49)
c156948327 curl: Update script to get curl 7.72.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5143
 2020-08-25 10:28:19 -04:00
Brad King 7e7c7fdb7f Merge branch 'release-3.18' 2020-08-25 10:26:54 -04:00
Brad King 4294526504 Merge topic 'msvc_static_assert' 
95bc11dbb4 MSVC: Record support for c_static_assert

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5148
 2020-08-25 10:26:54 -04:00
Brad King d2c3dea64b Merge topic 'msvc_static_assert' into release-3.18 
95bc11dbb4 MSVC: Record support for c_static_assert

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5148
 2020-08-25 10:26:54 -04:00
Kitware Robot d9aa99dd54 CMake Nightly Date Stamp 2020-08-25 00:01:11 -04:00
Craig Scott 9e61327d03 Merge topic 'fetchcontent-source-dir' 
b972e25276 FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overridden

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5156
 2020-08-24 18:29:13 -04:00
Craig Scott 353d266a72 Merge topic 'known_features_docs' 
268fcc2782 Help: Separate C++ compile feature by standard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5151
 2020-08-24 18:23:58 -04:00
Kitware Robot 6db6913eec CMake Nightly Date Stamp 2020-08-24 00:01:17 -04:00
Craig Scott b972e25276 FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overridden 
Fixes: #21123
 2020-08-23 18:38:47 +10:00
Kitware Robot 269d1a8624 CMake Nightly Date Stamp 2020-08-23 00:01:09 -04:00
Francisco Pombal 268fcc2782 Help: Separate C++ compile feature by standard 
Additionally, mention that no fine-grained features are available for
C++ 17 and beyond.

Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2020-08-23 13:49:40 +10:00
Raul Tambre 940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM 
Fixes #20771.
 2020-08-22 09:16:21 +03:00
Kitware Robot 08170b1b57 CMake Nightly Date Stamp 2020-08-22 00:01:14 -04:00
Brad King 6cbaa8eb93 Merge topic 'clang-cl-restore-preprocess' 
7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5142
 2020-08-21 09:31:08 -04:00
Kyle Edwards 3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions 2020-08-21 09:17:27 -04:00
Raul Tambre 359c500a24 cmTarget: Raise error if imported target location is not set 
Previously we would synthesize <TARGET_NAME>-NOTFOUND as the location. This
would then end up on the link line and cause build failures.
Policy CMP0110 is added to control this behaviour.

Fixes #19080, #19943.
 2020-08-21 08:38:39 -04:00
Kitware Robot 692bc2de94 CMake Nightly Date Stamp 2020-08-21 00:01:09 -04:00
Raul Tambre 27a912193b file(GENERATE): Add TARGET argument 
Adds TARGET argument to file(GENERATE) to make resolving generator expressions
requiring a target possible.

Implements #21101, fixes #21074.
 2020-08-20 17:41:52 +03:00
Raul Tambre 95bc11dbb4 MSVC: Record support for c_static_assert 
Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
 2020-08-20 09:45:47 -04:00
Brad King 8de3a25ec3 Merge branch 'release-3.18' 2020-08-20 09:21:33 -04:00
Brad King aaa5eab410 CMake 3.18.2 v3.18.2 2020-08-20 08:20:32 -04:00
Brad King 2a8f363a54 Merge topic 'fix-file-generate-cmp0070' 
462b6d83e8 file(GENERATE): Test source properties
1977f7833b file(GENERATE): Update existing tests
04fbd7566a file(GENERATE): Fix missing check for policy CMP0070
2dc2732f67 file(GENERATE): Refactor outputFileName calculation
a9602bb41e file(GENERATE): Refactor inputFileName calculation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5090
 2020-08-20 07:59:23 -04:00
Brad King 692d259f9e Merge topic 'doc-git-describe' 
e05b200be2 Help/dev: Update CMake Review Process document to suggest 'git describe'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5149
 2020-08-20 07:57:19 -04:00
Brad King 4fc1dd2ff1 Merge topic 'FindMPI-cuda-pthread' into release-3.18 
47abe5f225 FindMPI: Fix regression in pthread guard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5147
 2020-08-20 07:55:23 -04:00
Brad King 579ada3043 Merge branch 'release-3.18' 2020-08-20 07:55:23 -04:00
Brad King e029cb1ca6 Merge topic 'FindMPI-cuda-pthread' 
47abe5f225 FindMPI: Fix regression in pthread guard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5147
 2020-08-20 07:55:23 -04:00
Brad King 590b8791a0 Merge topic 'gitlab-ci-msvc-14.27' into release-3.18 
983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5144
 2020-08-20 07:53:12 -04:00
Brad King 84148558fd Merge branch 'release-3.18' 2020-08-20 07:53:12 -04:00
Brad King 453596374e Merge topic 'gitlab-ci-msvc-14.27' 
983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5144
 2020-08-20 07:53:12 -04:00
Brad King 4abd3a6519 Merge branch 'release-3.18' 2020-08-20 07:49:28 -04:00
Brad King eeaa890147 Merge topic 'msvc_c11' into release-3.18 
f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5145
 2020-08-20 07:49:27 -04:00
Brad King d13b010321 Merge topic 'msvc_c11' 
f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5145
 2020-08-20 07:49:27 -04:00
Brad King e05b200be2 Help/dev: Update CMake Review Process document to suggest 'git describe' 
Using `git describe --contains` is the preferred way to reference a
commit relative to a tag.
 2020-08-20 07:29:06 -04:00
Axel Huebl 47abe5f225 FindMPI: Fix regression in pthread guard 
Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags
slip to nvcc again.  In commit b725a19072 (FindMPI: Deny -fexceptions
from NVCC, 2020-07-02, v3.18.0-rc4~12^2) we accidentally forgot to use
the variable containing the replacement result.

Fixes: #21108
 2020-08-20 06:52:45 -04:00
Kitware Robot b544a1ebec CMake Nightly Date Stamp 2020-08-20 00:01:12 -04:00
Brad King 983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27 2020-08-19 14:53:46 -04:00
Brad King f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27 
Since commit f7347f28c7 (MSVC: Record support for C11 and c_restrict,
2020-08-09) we know about MSVC C language standards.  Update the
`RunCMake.try_compile` test to be aware of this even when CMake is
itself configured by an older CMake that does not know this.
 2020-08-19 14:52:52 -04:00
Brad King 387ea71853 curl: Set build options the way we need for CMake 2020-08-19 13:07:30 -04:00
Brad King 7d0fa4a943 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-08-19 (9d954e49)
 2020-08-19 12:50:05 -04:00
Curl Upstream 7ceb56989f curl 2020-08-19 (9d954e49) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 9d954e49bce3706a9a2efb119ecd05767f0f2a9e (curl-7_72_0).
 2020-08-19 12:44:30 -04:00
Brad King c156948327 curl: Update script to get curl 7.72.0 2020-08-19 12:44:12 -04:00
Brad King 162583bb19 Merge topic 'CMakeDetermineCXXCompiler-clang-typo' 
10d7445dd8 clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5140
 2020-08-19 11:51:03 -04:00
Brad King 80b9c4411b Merge topic 'ccmake-no-form-warnings' 
16accdc76e ccmake: suppress warnings in third-party form code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5141
 2020-08-19 11:49:18 -04:00
Brad King cb5c8e6f25 Merge topic 'cpack-wix-custom-xmlns' 
267de3ba30 CPack/WiX: Add support for custom XML namespaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5132
 2020-08-19 11:48:24 -04:00
Brad King fed08ce4cf Merge topic 'ExternalProject-retry-only-recoverable' 
116b06870d ExternalProject: add INACTIVITY_TIMEOUT argument
f24e34975a ExternalProject: retry download on recoverable errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5034
 2020-08-19 11:47:34 -04:00
Brad King f1ec88708d Merge topic 'CMakeDependentOption-doc' 
91f791b498 CMakeDependentOption: Expand documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5138
 2020-08-19 11:46:29 -04:00