mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-07 04:02:23 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King a6c78c049a Merge branch 'release-3.14' 2019-05-01 12:03:46 -04:00
Brad King 6dbc12df68 Merge topic 'FindPython-NumPy-fix-dependencies-management' 
68c8201711 FindPython: NumPy: fix erroneous dependencies management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3274
 2019-05-01 12:02:07 -04:00
Brad King a1709057ef Merge topic 'FindBoost-fix-fiber-compiler-features' 
f06bf0fa57 FindBoost: Fix compiler features for `fiber` and `context`
684338aff6 FindBoost: Record compiler features for Boost 1.67 and above

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3266
 2019-05-01 12:00:54 -04:00
Brad King 24e7554e15 Merge branch 'release-3.13' 2019-05-01 11:59:52 -04:00
Brad King 87120b9c2a Merge topic 'out-of-dir-linking-private-deps' 
3d3713121b target_link_libraries: Fix static library private deps in other dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3276
 2019-05-01 11:50:33 -04:00
Fred Baksik 6ad699358b cmake: --build -j <jobs> should not accept 0. 
Fixes #19059
 2019-05-01 09:15:51 -04:00
Gregor Jasny b7b66919a3 SwiftMix: properly export SwiftMain method 2019-05-01 13:30:14 +02:00
Gregor Jasny cab5471a7b SwiftMix: Get rid of pointer types mismatch warning 2019-05-01 13:30:14 +02:00
Kitware Robot f4e2face6f CMake Nightly Date Stamp 2019-05-01 00:01:05 -04:00
Craig Scott e138207c42 Merge topic 'message-new-types-and-logging' 
599587feb1 message(): Minor code modernization
6cc93b370e message(): Add support for log levels
377d1b7896 cmSystemTools: Remove unused message-related code, simplify logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3268
 2019-04-30 18:35:06 -04:00
Brad King 463e20c5c6 Merge branch 'FindPython-NumPy-fix-dependencies-management' into release-3.14 
Merge-request: !3274
 2019-04-30 14:58:22 -04:00
Brad King d4a79a6ab3 Merge branch 'FindBoost-fix-fiber-compiler-features' into release-3.14 
Merge-request: !3266
 2019-04-30 14:26:42 -04:00
Alex Turbov f06bf0fa57 FindBoost: Fix compiler features for fiber and context 2019-04-30 14:26:07 -04:00
Alex Turbov 684338aff6 FindBoost: Record compiler features for Boost 1.67 and above 
Remove the 1.67 upper-bound on compiler feature computation so that with
newer versions we at least get it mostly right.  Leave a comment with
notes about updating features for future versions.
 2019-04-30 14:25:51 -04:00
Brad King b947113b42 Merge branch 'out-of-dir-linking-private-deps' into release-3.14 
Merge-request: !3276
 2019-04-30 13:56:08 -04:00
Brad King c9469c78a5 Merge branch 'out-of-dir-linking-private-deps' into release-3.13 
Merge-request: !3276
 2019-04-30 13:55:48 -04:00
Brad King 3d3713121b target_link_libraries: Fix static library private deps in other dirs 
In commit a1ad0a699b (target_link_libraries: Allow use with targets in
other directories, 2018-09-07, v3.13.0-rc1~94^2) we accidentally broke
the logic that adds `$<LINK_ONLY:...>` to private dependencies of static
libraries in their `INTERFACE_LINK_LIBRARIES` in the case that the
dependency is added from outside the directory creating the library.
The check for a valid target name should apply to the original name
specified by the caller and not the encoded cross-directory reference.

Fixes: #19197
 2019-04-30 13:53:10 -04:00
Alexandru Croitor 4783b842ba iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined 
This allows overriding them in a toolchain file.
 2019-04-30 19:10:08 +02:00
Alexandru Croitor 5f5e3062cf iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs 
Both CMAKE_FIND_ROOT_PATH_MODE_INCLUDE and
CMAKE_FIND_ROOT_PATH_MODE_LIBRARY are set to "ONLY" when cross
building to iOS, but appears that CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
was overlooked.

This causes packages to be searched for in the host system as well,
which is incorrect and can lead to linking issues.

Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE to "ONLY" as well.

CMAKE_FIND_ROOT_PATH_MODE_PROGRAM is not touched, because a user
might want to find programs / tools on the host system.
 2019-04-30 18:55:28 +02:00
Brad King ea026fb219 Merge topic 'cmuvstreambuf' 
c74698cb75 cmUVStreambuf: Add std::streambuf implementation for uv_stream_t
8cfd25db71 cmUVHandlePtr: Add cm::uv_loop_ptr
c0e6b22d0a Refactor: Move/rename cmProcessGetPipes() to cmGetPipes()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3240
 2019-04-30 10:35:11 -04:00
Kyle Edwards 40852eed8e Merge topic 'source_group-tree-files' 
8d93815d20 source_group command ensures that FILES arguments are actually files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3265
 2019-04-30 10:30:35 -04:00
Brad King d0e6fc2833 Merge topic 'relax_TARGET_OBJECT_generator_expr' 
ce078dda79 Relax the usage of TARGET_OBJECTS generator expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3178
 2019-04-30 10:09:52 -04:00
Brad King 60515b205e Merge topic 'findmpi-msvc-nolibdir' 
7db32efbab FindMPI: Don't retain libdirs for Win32

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3253
 2019-04-30 10:08:22 -04:00
Brad King d9a4da453f Merge topic 'server-deprecate' 
996e1885c4 server: deprecate in favor of the file-api

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !3251
 2019-04-30 10:07:27 -04:00
Brad King 60b28de5c8 Merge topic 'add-execute_process-command-echo' 
044dcf9f8d execute_process: Add option to echo command lines
d350fb6889 execute_process: Manage KWSys Process lifetime with unique_ptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3165
 2019-04-30 10:05:09 -04:00
Brad King b74061ba38 Merge topic 'msvc-runtime-library' 
61f70e81a7 MSVC: Document and test behavior of empty MSVC_RUNTIME_LIBRARY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3249
 2019-04-30 10:03:20 -04:00
Marc Chevrier 68c8201711 FindPython: NumPy: fix erroneous dependencies management 2019-04-30 16:02:18 +02:00
Brad King 71371e3d93 Merge topic 'msvc-c-features' 
eca275f63d CompileFeatures: Fix hard-coded MSVC C features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3247
 2019-04-30 09:59:57 -04:00
Alexandru Croitor 94c5fa5f7a iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values 
Currently the value is hardcoded to contain only the sysroot for
the respective darwin platform. This means that it can not be changed
in a custom toolchain file.

Instead of overriding the value, simply append it. This is similar
to how it is done in the Google provided Android toolchain file.

The usecase is to allow specifying addiitonal roots to look for
3rd party packages which are definitely not present in the default
sysroot.
 2019-04-30 13:40:31 +02:00
Alexandru Croitor 1011350694 iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file 
Currently CMAKE_MACOSX_BUNDLE is always set to true when compiling
for iOS. This poses a problem when using the source file
variant of try_compile. Even if a custom value is passed via
the CMAKE_FLAGS option, it would still be overridden by the
Darwin.cmake file.

Only set the value in case no other value was provided before.
 2019-04-30 13:40:31 +02:00
Harry Mallon d9beea0cca CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUG 2019-04-30 10:52:53 +01:00
Kitware Robot 4eebc52eca CMake Nightly Date Stamp 2019-04-30 00:01:05 -04:00
Robert Maynard 8d45a2ffe0 CompileFeatures: Record when compilers gained full CXX11 support 
Use the infrastructure added by commit 646fb1a646 (CompileFeatures:
memoize C++ compilers with full language level support, 2019-03-27) to
avoid using a `try_compile` to check for C++11 feature support when the
running compiler is known to have all features.
 2019-04-29 17:18:45 -04:00
Kyle Edwards 1c7863a765 Merge topic 'intel_simulate' 
a893018c47 Project: Report intel's simulation of gcc.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3264
 2019-04-29 10:40:39 -04:00
Kitware Robot a40c9825bb CMake Nightly Date Stamp 2019-04-29 00:01:05 -04:00
Alex Turbov 599587feb1 message(): Minor code modernization 2019-04-28 22:45:44 +10:00
Alex TurbovandCraig Scott 6cc93b370e message(): Add support for log levels 
Relates: #18943
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2019-04-28 22:45:44 +10:00
Kitware Robot d8426b57a6 CMake Nightly Date Stamp 2019-04-28 00:01:04 -04:00
Alex Turbov 377d1b7896 cmSystemTools: Remove unused message-related code, simplify logic 2019-04-27 18:36:45 +10:00
Kitware Robot a9c113fd3e CMake Nightly Date Stamp 2019-04-27 00:01:04 -04:00
Daniel Schürmann 4d78bea5df IAR: Fail early in case of IAR ARM 4.XX 
This version is not yet supported because it uses xlink unsetad of ilink.
 2019-04-26 10:15:01 +02:00
Kitware Robot 68031b4fdd CMake Nightly Date Stamp 2019-04-26 00:01:07 -04:00
R. Andrew Ohana a893018c47 Project: Report intel's simulation of gcc. 2019-04-25 13:37:44 -07:00
Kyle Edwards 1ddce8fd6d Merge topic 'cmWorkerPool_Tweaks' 
56890ede2a cmWorkerPool: Factor our worker thread class (internals)
9794b72d38 cmWorkerPool: Set worker thread count separately to Process()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3260
 2019-04-25 15:34:12 -04:00
Mateusz Janek 8d93815d20 source_group command ensures that FILES arguments are actually files 2019-04-25 20:51:40 +02:00
Kyle Edwards c74698cb75 cmUVStreambuf: Add std::streambuf implementation for uv_stream_t 
This will allow std::istream/std::ostream-based interaction with
processes spawned by libuv.
 2019-04-25 12:14:00 -04:00
Kyle Edwards 8cfd25db71 cmUVHandlePtr: Add cm::uv_loop_ptr 2019-04-25 12:03:08 -04:00
Kyle Edwards c0e6b22d0a Refactor: Move/rename cmProcessGetPipes() to cmGetPipes() 2019-04-25 12:03:08 -04:00
Daniel Schürmann 0b684524ac IAR: Fix building with IAR ARM 6.X 
Use the correct version macros and version numbers.
 2019-04-25 15:25:16 +02:00
Stefan Andersson 01a4eec446 IAR: Changes required for Linux 2019-04-25 11:28:58 +02:00