mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-05 22:59:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,339 Commits 2 Branches 390 Tags
9bf6cbc8f78c616087ded2154c6cb7e04ef33db1
Commit Graph

43339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
9bf6cbc8f7 CMake Nightly Date Stamp 2019-05-07 00:01:05 -04:00
Brad King
c6f6e2b305 Merge branch 'release-3.14' 2019-05-06 09:40:12 -04:00
Brad King
aae79c2d70 Merge topic 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable' 
34c0293532 FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3287
 2019-05-06 09:33:45 -04:00
Brad King
f0185ff14a Merge topic 'fix_ios_try_compile' 
275b6b3194 iOS: Fix try_compile FILE_COPY not to fail

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3272
 2019-05-06 09:32:25 -04:00
Brad King
6399e2246f Merge branch 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable' into release-3.14 
Merge-request: !3287
 2019-05-06 09:26:05 -04:00
Brad King
2951d71111 Merge branch 'fix_ios_try_compile' into release-3.14 
Merge-request: !3272
 2019-05-06 09:25:53 -04:00
Alexandru Croitor
275b6b3194 iOS: Fix try_compile FILE_COPY not to fail 
When building for iOS, the compiled target is placed into a bundle.
If a single-configuration generator is used, like Makefiles or Ninja,
the try_compile FILE_COPY behavior fails to find the bundle, because
it only looks for the bundle inside a Debug subfolder (presumably
to support a multi-configuration generator like Xcode).

Consider looking for the bundle in the root try_compile folder, as
well as in the location specified by CMAKE_TRY_COMPILE_CONFIGURATION.

Closes: #19211
 2019-05-06 09:23:27 -04:00
Brad King
1820c7e780 Merge topic 'SWIG' 
e3919bae17 UseSWIG: Manage alternate library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3241
 2019-05-06 09:19:38 -04:00
Brad King
b9ee95fe5e Merge topic 'findice-clang-cl' 
541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3284
 2019-05-06 09:18:28 -04:00
Kitware Robot
0f27e7d165 CMake Nightly Date Stamp 2019-05-06 00:01:05 -04:00
Marc Chevrier
34c0293532 FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly 2019-05-05 12:55:39 +02:00
Kitware Robot
3771a75d58 CMake Nightly Date Stamp 2019-05-05 00:01:03 -04:00
Kitware Robot
d3a0582b0c CMake Nightly Date Stamp 2019-05-04 00:01:05 -04:00
Marc Chevrier
e3919bae17 UseSWIG: Manage alternate library name 
Manage alternate library name by passing -interface <library_name>
for python language or -dllimport <library_name> for CSharp language
to the SWIG compiler.

Fixes: #18771
 2019-05-03 18:20:17 +02:00
Brad King
186ca170da Merge topic 'std-pipes-always' 
c85524a94a Ensure stdin, stdout, and stderr pipes are always open

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !3282
 2019-05-03 11:48:46 -04:00
Brad King
6f242acfcb Merge topic 'cpack-ifw-stylesheet' 
c474fb2777 CPack/IFW: Add StyleSheet field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3270
 2019-05-03 11:46:25 -04:00
Brad King
9713154cf6 Merge topic 'jobs-positive-value' 
6ad699358b cmake: --build -j <jobs> should not accept 0.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3255
 2019-05-03 11:45:32 -04:00
Brad King
cd285b7496 Merge topic 'DetermineCompilerId-versioned-llvm-for-vs' 
c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3281
 2019-05-03 11:43:50 -04:00
Brad King
323c4fb989 Merge topic 'genex-TARGET_FILE_BASE_NAME-manage-postfix' 
6e5ccabe9b Genex: Update $<TARGET_FILE_BASE_NAME:...>: take care of POSTFIX
1f4c9aa7d2 Refactor: introduce method cmGeneratorTarget::GetFilePostfix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3267
 2019-05-03 11:42:47 -04:00
Brad King
784dd90fd4 Merge topic 'memorize_cxx_compilers_with_full_CXX14_support' 
3dbec53255 CompileFeatures: Record when compilers gained full CXX14 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3280
 2019-05-03 11:30:04 -04:00
jspam
541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID 
This applies commit d48bf97f, which does the same for FindBoost, to FindIce.
 2019-05-03 01:32:14 -04:00
Kitware Robot
713f1a0e7d CMake Nightly Date Stamp 2019-05-03 00:01:06 -04:00
Brad King
c85524a94a Ensure stdin, stdout, and stderr pipes are always open 
On non-Windows platforms libuv assumes that file descriptors 0-2 are
always used for standard pipes and never for anything else.  Otherwise,
libuv may re-use one of these descriptors and then fail an assertion
when closing it.  Similarly, On Windows platforms our ConsoleBuf
implementation assumes that the standard handles are always open.

If CMake is run with any standard pipes closed, open them with
`/dev/null` or `NUL` to satisfy these assumptions.

Fixes: #19219
 2019-05-02 14:34:58 -04:00
Zaytsev Yuriy
c474fb2777 CPack/IFW: Add StyleSheet field 2019-05-02 13:01:31 -04:00
Robert Maynard
3dbec53255 CompileFeatures: Record when compilers gained full CXX14 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++14 feature support when the
running compiler is known to have all features.
 2019-05-02 10:23:25 -04:00
Brad King
ce79364581 Merge topic 'ios_fixes' 
4783b842ba iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined
5f5e3062cf iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs
94c5fa5f7a iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values
1011350694 iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3273
 2019-05-02 09:46:39 -04:00
Brad King
eef1dacf51 Merge topic 'cpackrpm.debug' 
d9beea0cca CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3271
 2019-05-02 09:44:13 -04:00
Brad King
e08efc36eb Merge topic 'genex-code-cleanup' 
3d856eba16 cmGeneratorExpressionNode: refactor TargetPropertyNode
9e1df5df54 cmGeneratorExpressionNode: use ctor arguments instead of macro
36f36d6a49 cmGeneratorExpressionNode: add VersionNode
3f57787dff cmGeneratorExpressionNode: remove structs CompilerId*, CompilerVersion*
20d7c5631e cmGeneratorExpressionNode: add CharacterNode
abd62201bd cmGeneratorExpressionNode: simplify code in EqualNode
f2c8ff8259 cmGeneratorExpressionNode: Simplify static string constant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3234
 2019-05-02 09:43:09 -04:00
Brad King
3b4315dc23 Merge topic 'code-cleanup-3' 
75643755a1 cmGlobalVisualStudioGenerator: remove redundant variables
615fb2633c cmGlobalVisualStudioGenerator: use cmJoin to join the filenames
30c98db61b cmGlobalVisualStudioGenerator: use auto instead of iterator types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3257
 2019-05-02 09:42:08 -04:00
Brad King
1ee21c6ec5 Merge topic 'fix-swiftmix-test-for-xcode-10.2' 
b7b66919a3 SwiftMix: properly export SwiftMain method
cab5471a7b SwiftMix: Get rid of pointer types mismatch warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3279
 2019-05-02 09:33:33 -04:00
Marc Chevrier
6e5ccabe9b Genex: Update $<TARGET_FILE_BASE_NAME:...>: take care of POSTFIX 
This capability complement MR !3190 and !3207
and is also needed to solve issue #18771.
 2019-05-02 11:01:10 +02:00
Marc Chevrier
1f4c9aa7d2 Refactor: introduce method cmGeneratorTarget::GetFilePostfix 2019-05-02 10:06:04 +02:00
Kitware Robot
3ee16ef31b CMake Nightly Date Stamp 2019-05-02 00:01:07 -04:00
Zufu Liu
c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio. 
Supports versioned LLVM toolsets like LLVM_v142, LLVM_v141,
LLVM_v141_xp, etc. for Visual Studio (2010 and later).

The name for versioned LLVM toolsets has "LLVM_" prefix
plus MSVC toolset name (i.e. v142, v141, v141_xp, etc.).

Fixes: #19203
 2019-05-02 10:57:37 +08:00
Brad King
fb325daa55 Merge topic 'IAR_6_x_fix' 
4d78bea5df IAR: Fail early in case of IAR ARM 4.XX
0b684524ac IAR: Fix building with IAR ARM 6.X

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3263
 2019-05-01 12:42:29 -04:00
Brad King
13b73ff65f Merge topic 'iar-binutils' 
01a4eec446 IAR: Changes required for Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3262
 2019-05-01 12:41:30 -04:00
Brad King
34d67a2405 Merge topic 'memorize_cxx_compilers_with_full_CXX11_support' 
8d45a2ffe0 CompileFeatures: Record when compilers gained full CXX11 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3232
 2019-05-01 12:40:15 -04:00
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