mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 09:08:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,623 Commits 2 Branches 401 Tags
2834f3355d30f5ac9faaf47fc2e34dfa6f300c7e
Commit Graph

46623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier 2834f3355d Bootstrap: take care of C++ features configuration 2020-02-01 16:21:41 +01:00
Kitware Robot 7dd5ca66c9 CMake Nightly Date Stamp 2020-01-30 00:01:11 -05:00
Brad King feea34e7eb Merge branch 'release-3.15' 2020-01-29 10:40:42 -05:00
Brad King b3586a176f Merge branch 'release-3.16' 2020-01-29 10:36:40 -05:00
Brad King 92f04d3790 Merge topic 'vs-16.4-custom-command-inputs' 
58b0674687 VS: Tell VS 16.4 not to verify SYMBOLIC custom command inputs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4297
 2020-01-29 10:36:40 -05:00
Brad King f972b929d6 Merge topic 'vs-16.4-custom-command-inputs' into release-3.16 
58b0674687 VS: Tell VS 16.4 not to verify SYMBOLIC custom command inputs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4297
 2020-01-29 10:36:40 -05:00
Brad King 38ee7db2ac Merge topic 'mixed-mode-multi-arch' 
15f6606abd Swift: disallow multiple `CMAKE_OSX_ARCHITECTURES` with Swift

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4283
 2020-01-29 10:32:38 -05:00
Brad King c46a26a4c9 Merge topic 'FindCUDAToolkit-target-guards' 
916d54dfb3 FindCUDAToolkit: Fix behavior on multiple calls
b452e2bd6a FindCUDAToolkit: Fix CUDA::* target guard logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4293
 2020-01-29 10:24:41 -05:00
Brad King 5a5bc85e35 Merge topic 'stl-support-make_unique-supports-array' 
fa828b8fba STL support: make_unique can now handle array

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4295
 2020-01-29 10:24:01 -05:00
Brad King 4e0d69c142 Merge topic 'fortran-subdir-simplify' 
a7b844d6d4 CMakeAddFortranSubdirectory: Simplfy logic to always build subdir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4296
 2020-01-29 10:23:19 -05:00
Brad King 0adc266594 Merge topic 'blas-intel-mkl' 
4d7c69208e Find{BLAS,LAPACK}: Search always in dynamic linker paths
fde5fcbc71 Find{BLAS,LAPACK}: Avoid repeated setting of prefered library suffixes
fd1d4b823f Find{BLAS,LAPACK}: Fixed incorrect static library suffix for Apple
c60c847510 Find{BLAS,LAPACK}: Added support for MKL single dynamic library
59dbff6daa Find{BLAS,LAPACK}: Added support for static MKL required linker flags
6bd9cee638 Find{BLAS,LAPACK}: Fixed detection of MKL, and several MKL improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4246
 2020-01-29 10:22:12 -05:00
Brad King 4b89232ffa Merge topic 'mf-json-type' 
5a72ffb33a cmMakefile: Fix construction of Json::Value from fixed-size int types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4291
 2020-01-29 10:21:24 -05:00
Kitware Robot e13a858555 CMake Nightly Date Stamp 2020-01-29 00:01:14 -05:00
Rodolfo Lima 916d54dfb3 FindCUDAToolkit: Fix behavior on multiple calls 
Update `_CUDAToolkit_find_and_add_import_lib` to create and add
dependencies to a target in one step that shared a single guard against
repeated definitions.  Otherwise we were adding dependencies again on
every call.

Fixes: #20282
 2020-01-28 14:21:24 -05:00
Rodolfo Lima b452e2bd6a FindCUDAToolkit: Fix CUDA::* target guard logic 
Issue: #20282
 2020-01-28 14:21:24 -05:00
Brad King 3c5f0037f7 Merge branch 'vs-16.4-custom-command-inputs' into release-3.15 
Merge-request: !4297
 2020-01-28 13:59:27 -05:00
Brad King a7b844d6d4 CMakeAddFortranSubdirectory: Simplfy logic to always build subdir 
In the case that we use ExternalProject_Add to drive the subdirectory
build, replace the `forcebuild` step with the official `BUILD_ALWAYS`
option.

Issue: #20179
 2020-01-28 13:57:05 -05:00
Brad King 58b0674687 VS: Tell VS 16.4 not to verify SYMBOLIC custom command inputs 
Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify
SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to
SYMBOLIC *inputs* too.  This is needed when there is a chain of custom
commands that use symbolic paths for ordering.

Fixes: #20179
 2020-01-28 13:52:05 -05:00
Saleem Abdulrasool 15f6606abd Swift: disallow multiple CMAKE_OSX_ARCHITECTURES with Swift 
This disallows the use of multiple values in `CMAKE_OSX_ARCHITECTURES`
with Swift which does not support FAT compilation.
 2020-01-28 10:13:28 -08:00
Raul Tambre 5a72ffb33a cmMakefile: Fix construction of Json::Value from fixed-size int types 
Cast to the Json-provided fixed-size integer types rather than assuming
that the `std::*` variants match.

Fixes: #20278
 2020-01-28 11:47:33 -05:00
Brad King 228dc92b09 Merge topic 'mf-typo' 
7b6af980eb cmMakefile: Fix spelling typo in comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4292
 2020-01-28 11:40:02 -05:00
Marc Chevrier fa828b8fba STL support: make_unique can now handle array 2020-01-28 17:38:17 +01:00
Brad King a4d7a79beb Merge topic 'ninja-1.10' 
ccaa0bccc4 Ninja: Do not clean metadata when re-generating inside a running build
657820a00b Ninja: Track when running to re-generate during a build
b12b013028 Ninja: Factor metadata cleanup into dedicated method
5d92e60d81 Ninja: Skip cleandead and recompact if build.ninja is missing
dd0a4718fd Ninja: Fix CMAKE_NINJA_OUTPUT_PATH_PREFIX with Ninja 1.10
0944caaebb Tests: Fix RunCMake.CMP0037 test with Ninja 1.10
9d4883cce5 Tests: Fix RunCMake.Ninja test for Ninja 1.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4290
 2020-01-28 11:35:24 -05:00
Brad King 7706b6a714 Merge topic 'xcode-top-level-only-with-object-library' 
64304fe72b Xcode: Fix post build script for 'top level project only' opt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4284
 2020-01-28 11:05:17 -05:00
Brad King ee5edfbda2 Merge topic 'dot-dir' 
830a7d8803 cmArchiveWrite: Remove ./ suffix from zip archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4288
 2020-01-28 11:04:30 -05:00
Brad King cb8bd146c9 Merge topic 'modernize-memory-management' 
b50b2755da cmComputeLinkInformation: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4285
 2020-01-28 11:03:34 -05:00
Brad King 1d08099be7 Merge topic 'FindBoost-delay-helper-targets' 
e0e87b9d70 FindBoost: Do not add any Boost targets until after Boost found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !4280
 2020-01-28 11:02:41 -05:00
Brad King 193352e420 Merge topic 'clang-tidy-driver-mode' 
f6f4eb0907 clang-tidy: Add driver mode argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4208
 2020-01-28 11:01:19 -05:00
Brad King e3be80f4fc Merge topic 'append-std-string' 
1398517f31 AppendProperty: convert value param to std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4282
 2020-01-28 11:00:16 -05:00
Brad King b6da71e299 Merge topic 'osx-version-flags' 
6a84f0b791 macOS: Test OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties
4a62e3d97c macOS: Add OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4274
 2020-01-28 10:59:03 -05:00
Brad King e4e41d33d6 Merge topic 'cmsting-stl-compatibility' 
8f839d02e3 cm::String: enhance compatibility with STL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4281
 2020-01-28 10:58:11 -05:00
Brad King 571205fb6b Merge topic 'QNX_CMAKE_SYSROOT' 
32a6ab1f3b QNX: Add support for CMAKE_SYSROOT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4277
 2020-01-28 10:56:41 -05:00
Masashi Fujita 7b6af980eb cmMakefile: Fix spelling typo in comment 2020-01-28 10:54:15 -05:00
Brad King 1f9321c683 Merge topic 'cuda_runtime_library_controls' 
0d0145138f CUDA: Add abstraction for cuda runtime selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4178
 2020-01-28 10:52:33 -05:00
Brad King 2e4a948fb8 Merge topic 'findCUDAToolkit_better_find_root_support' 
45d21dd5d4 CUDAToolkit: Use CMAKE_FIND_ROOT_PATH for all sdk lib searches
e357772f20 CUDAToolkit: Use HINTS as it has higher precedence for searches
c6ec51c625 CUDAToolkit: functions names now use CMake's reserved namespace

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4278
 2020-01-28 10:49:05 -05:00
Brad King d6028df6a5 Merge topic 'install-name-tool-bug' 
162e8aeb9e Tests: Disable test on problematic versions of install_name_tool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4276
 2020-01-28 10:46:10 -05:00
Mario Emmenlauer 4d7c69208e Find{BLAS,LAPACK}: Search always in dynamic linker paths 
Previously the search in the dynamic linker paths 'LIB', 'LD_LIBRARY_PATH'
and 'DYLD_LIBRARY_PATH' was dependent on the value of the environment
variable 'MKLROOT'. If MKLROOT was given, the dynamic linker paths where
not searched. This seems slightly counter-intuitive.
This PR changes the behavior so that MKLROOT is searched first, but if
unsuccesful, the dynamic linker paths are tried as well.
 2020-01-28 10:27:22 +01:00
Mario Emmenlauer fde5fcbc71 Find{BLAS,LAPACK}: Avoid repeated setting of prefered library suffixes 2020-01-28 10:27:22 +01:00
Mario Emmenlauer fd1d4b823f Find{BLAS,LAPACK}: Fixed incorrect static library suffix for Apple 2020-01-28 10:27:22 +01:00
Mario Emmenlauer c60c847510 Find{BLAS,LAPACK}: Added support for MKL single dynamic library 2020-01-28 10:27:22 +01:00
Mario Emmenlauer 59dbff6daa Find{BLAS,LAPACK}: Added support for static MKL required linker flags 2020-01-28 10:27:22 +01:00
Mario Emmenlauer 6bd9cee638 Find{BLAS,LAPACK}: Fixed detection of MKL, and several MKL improvements 2020-01-28 10:27:22 +01:00
Kitware Robot 03e2757c66 CMake Nightly Date Stamp 2020-01-28 00:01:07 -05:00
Yauheni Khnykin 64304fe72b Xcode: Fix post build script for 'top level project only' opt 
When CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY is set on
Xcode generator created post build scripts which tried to call
XCODE_DEPEND_HELPER.make script in subproject.
But XCODE_DEPEND_HELPER.make don't exist in
subprojects when mentioned option is set on.

Fixes: #20262
 2020-01-27 16:14:19 -05:00
Robert Maynard 0d0145138f CUDA: Add abstraction for cuda runtime selection 
Fixes #17559
Replace our hard-coded default of cudart=static with a first-class abstraction to select the runtime library from an enumeration of logical names.
 2020-01-27 16:02:26 -05:00
Niall Murphy e0e87b9d70 FindBoost: Do not add any Boost targets until after Boost found 
Move creation of the "helper" targets that do not require anything to be
found to be done only after Boost is found.

Fixes: #20261
 2020-01-27 15:56:37 -05:00
Brad King ccaa0bccc4 Ninja: Do not clean metadata when re-generating inside a running build 
When `ninja` re-runs CMake to re-generate the build system, do not try
to use the ninja tools to update metadata on Windows.  The outer ninja
process is already holding the files open.

Issue: #20274
 2020-01-27 15:39:04 -05:00
Brad King 657820a00b Ninja: Track when running to re-generate during a build 
Tell CMake explicitly when it is re-running inside a `ninja` invocation
to re-generate the build system.
 2020-01-27 15:39:04 -05:00
Brad King b12b013028 Ninja: Factor metadata cleanup into dedicated method 2020-01-27 15:39:04 -05:00
Brad King 5d92e60d81 Ninja: Skip cleandead and recompact if build.ninja is missing 
In error cases the `build.ninja` file may not exist.  Skip running ninja
tools that require it so that we do not generate additional errors.
 2020-01-27 15:09:18 -05:00