Commit Graph

42675 Commits

Author SHA1 Message Date
Brad King d564d06194 Merge topic 'android-versioned-soname'
64e2c14c4a Android: allow user to enable versioned soname

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3063
2019-03-06 08:33:25 -05:00
Brad King 809890e3f6 Merge topic 'issue-18883-support-for-multiple-targets'
324d18bb34 cmake: Teach --build mode to support multiple targets
ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand
fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct
b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help
f1367c8c51 cmGlobalGenerator: Remove unused code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2939
2019-03-06 08:32:39 -05:00
Brad King 43771d6e73 Merge branch 'release-3.14' 2019-03-06 08:30:42 -05:00
Brad King ce9117fdbe Merge topic 'docs-install-destinations'
a5f79b83c7 Help: clarify DESTINATION and TYPE usage for install()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3052
2019-03-06 08:29:14 -05:00
Brad King 3e9ce09a56 Merge topic 'ios-docs'
376138fe0c Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOS
f7d602b572 Help: Example of tweaking iOS/tvOS/watchOS build
4a9e2e4f35 Help: find_package with fat iOS libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3047
2019-03-06 08:28:13 -05:00
Brad King 742339a779 Merge topic 'ios-variable'
e427c7c1d8 iOS: Add IOS variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3051
2019-03-06 08:27:20 -05:00
Kitware Robot 28186bd2ba CMake Nightly Date Stamp 2019-03-06 00:01:06 -05:00
Brad King ec79045b0e Merge branch 'docs-install-destinations' into release-3.14
Merge-request: !3052
2019-03-05 11:26:34 -05:00
Tom Yan 64e2c14c4a Android: allow user to enable versioned soname 2019-03-05 23:44:42 +08:00
Brad King 216fff285c Merge branch 'ios-docs' into release-3.14
Merge-request: !3047
2019-03-05 09:46:40 -05:00
Ruslan Baratov 376138fe0c Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOS 2019-03-05 09:45:50 -05:00
Ruslan Baratov f7d602b572 Help: Example of tweaking iOS/tvOS/watchOS build
CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_DEPLOYMENT_TARGET variables
can be used to tweak iOS/tvOS/watchOS build
2019-03-05 09:45:50 -05:00
Ruslan Baratov 4a9e2e4f35 Help: find_package with fat iOS libraries 2019-03-05 09:45:50 -05:00
Brad King 509a9409c3 Merge branch 'ios-variable' into release-3.14
Merge-request: !3051
2019-03-05 09:42:58 -05:00
Ruslan Baratov e427c7c1d8 iOS: Add IOS variable
Since commit 11da882a12 (Apple: Introduce separate system name for iOS,
tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) we support setting
`CMAKE_SYSTEM_NAME` to `iOS`.  Existing iOS toolchain files already
set `IOS` as a short-hand variable, so do the same here.
2019-03-05 09:42:41 -05:00
Brad King 451d3907fd Merge topic 'restore_broken_curses_gui'
aa68ce6bd4 ccmake: fix curses dialog broken by refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Artur Ryt <artur.ryt@gmail.com>
Merge-request: !3055
2019-03-05 09:04:46 -05:00
Brad King 168c11f70e Merge topic 'fix_autorcc_for_qt6'
bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3049
2019-03-05 09:04:06 -05:00
Bartosz Kosiorek 324d18bb34 cmake: Teach --build mode to support multiple targets
Fixes: #16136
2019-03-05 08:55:28 -05:00
Craig Scott a5f79b83c7 Help: clarify DESTINATION and TYPE usage for install() 2019-03-05 21:48:44 +11:00
Kitware Robot 4b3a739800 CMake Nightly Date Stamp 2019-03-05 00:01:20 -05:00
Felix Schwitzer aa68ce6bd4 ccmake: fix curses dialog broken by refactoring
During refactoring in commit f6291eee25 (cmCursesMainForm: Modernize
with STL and ranged-for loops, 2019-02-10) a transformation of a loop
went wrong and editing the cmake cache with ccmake no longer works.
Make ccmake work again.

Fixes: #19008
2019-03-04 09:12:41 -05:00
Brad King 6873e98486 Merge topic 'llvm-rc'
e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand
fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3007
2019-03-04 08:42:49 -05:00
Brad King 80898a49d9 Merge branch 'release-3.14' 2019-03-04 08:37:36 -05:00
Brad King 70d204410a Merge topic 'FindPython-NumPy-fix-include-dir'
8e3358336d FindPython: Fix NumPy component include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3053
2019-03-04 08:36:29 -05:00
Brad King dbd3b1ac90 Merge topic 'vs-fortran-rc'
0b82f56ac6 VS: Fix Fortran target type selection with RC sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3050
2019-03-04 08:35:46 -05:00
Brad King 5c0ef417b8 Merge branch 'FindPython-NumPy-fix-include-dir' into release-3.14
Merge-request: !3053
2019-03-04 08:28:56 -05:00
Marc Chevrier 8e3358336d FindPython: Fix NumPy component include directory
Update the component added by commit 513e77550d (FindPython: Introduce
NumPy component, 2018-12-12, v3.14.0-rc1~95^2).  The `numpy/`
sub-directory should not be part of the include directory.  It should be
part of the `#include` line.
2019-03-04 08:28:21 -05:00
Alexandru Croitor bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet
When building a Qt project, the AUTORCC functionality, by default,
uses the rcc binary to get the contents of a qrc file for
dependency information. This is done at CMake "generate" time.

The problem is that while configuring Qt itself, the rcc binary is
not built yet.
In that case, to get the contents of the qrc file, fall back to
the code branch which uses an ifstream instead of the rcc binary.
2019-03-04 12:45:16 +01:00
Bartosz Kosiorek ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand 2019-03-04 10:44:15 +01:00
Bartosz Kosiorek fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct 2019-03-04 10:44:14 +01:00
Bartosz Kosiorek b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help 2019-03-04 10:44:14 +01:00
Bartosz Kosiorek f1367c8c51 cmGlobalGenerator: Remove unused code 2019-03-04 10:44:14 +01:00
Kitware Robot d1558fbf3a CMake Nightly Date Stamp 2019-03-04 00:01:14 -05:00
Kitware Robot 033728e867 CMake Nightly Date Stamp 2019-03-03 00:01:05 -05:00
Kitware Robot 26068d2db8 CMake Nightly Date Stamp 2019-03-02 00:01:09 -05:00
Brad King 77439d97fe Merge branch 'vs-fortran-rc' into release-3.14
Merge-request: !3050
2019-03-01 12:02:31 -05:00
Brad King 0b82f56ac6 VS: Fix Fortran target type selection with RC sources
The Intel Fortran `.vfproj` files do support both Fortran and the
Windows Resource compiler (`.rc)` files.  Prior to CMake 3.9 we did not
support that, but commit 2c9f35789d (VS: Decide project type by linker
lang as fallback, 2017-03-30, v3.9.0-rc1~340^2) accidentally enabled it.
It was then broken by commit d3d2c3cd49 (VS: Fix Fortran target type
selection when linking C++ targets, 2019-02-04, v3.14.0-rc1~13^2).

Restore support for Fortran+RC in VS projects and add a test case.

Fixes: #19002
2019-03-01 11:58:21 -05:00
Brad King 6bc6f41068 Merge branch 'release-3.14' 2019-03-01 11:12:28 -05:00
Brad King 20a41aa589 CMake 3.14.0-rc3 v3.14.0-rc3 2019-03-01 09:25:27 -05:00
Brad King 57fd4b9d65 Merge branch 'release-3.14' 2019-03-01 09:10:51 -05:00
Brad King 980d9a987d Merge topic 'cuda_device_link_handle_frameworks'
d5d1b15654 CUDA: Filter out -framework arguments during device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3039
2019-03-01 09:08:56 -05:00
Brad King 4cda0b66fa Merge topic 'ExternalProject-fix-log-in-custom-stamp'
a6d3fee77c ExternalProject: Restore default log dir with custom stamp dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3045
2019-03-01 09:08:15 -05:00
Brad King 8b1716a62a Merge topic 'vs2019'
c9a7f3135e Help: Update VS 2019 generator release note for preview 4
00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Egor Pugin <egor.pugin@gmail.com>
Merge-request: !3044
2019-03-01 09:07:29 -05:00
Brad King 96a99d4069 Merge topic 'findjni-paths'
77cede0977 FindJNI: Unify path search, fix support for Java 9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3042
2019-03-01 09:06:52 -05:00
Brad King 8d9cf29074 Merge branch 'findjni-paths' into release-3.14
Merge-request: !3042
2019-03-01 09:05:57 -05:00
Brad King 911d67b173 Merge topic 'doc-install-internal-xref'
b8307adb9f Help: inter-link install() commands
19e15853e9 Help: add inter link anchors for install() commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3034
2019-03-01 08:53:31 -05:00
Christian Pfeiffer 77cede0977 FindJNI: Unify path search, fix support for Java 9
Java 9 restructured the standard location of the AWT libraries due to
the removal of the JRE/JDK separation. We should check all possible
combinations of subdirectories to the Java root directories to ensure
that the libraries will be found after an upgrade.

Furthermore, a root directory would contain both, include and library
paths, so the search should be unified to ease maintenance on the
module.
2019-03-01 08:53:26 -05:00
Brad King 0465c32a82 Merge topic 'processor_count_linux_containers'
f20eab9cdc ProcessorCount: Return the container CPU count instead of the host count

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3032
2019-03-01 08:52:37 -05:00
Brad King 9a5fe96f4f Merge topic 'drop-MIPSpro'
e21bae378d WCDH: Restore definition for <prefix>_COMPILER_IS_MIPSpro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3043
2019-03-01 08:51:50 -05:00
Zsolt Parragi e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
llvm-rc can't handle definitions given with /D and without a space.
2019-03-01 14:11:01 +01:00