mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 00:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
40,260 Commits 2 Branches 386 Tags
4d384d290e2c873ad1f8d749e54b1b097df727dd
Commit Graph

8641 Commits

Author SHA1 Message Date
Brad King
d64e41ac48 Merge topic 'nag-fortran-rsp' 
10d6c3a635 NAG: Pass response files through front-end to the linker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2250
 2018-08-06 08:24:43 -04:00
Brad King
7f981dcf0e Merge topic 'xl-exe-pic' 
c2856e0b2b XL: Use -qpic for position independent executables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2249
 2018-08-06 08:24:04 -04:00
Brad King
be095b3e7f Merge topic 'FindMatlab-mcc' 
f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2233
 2018-08-06 08:23:14 -04:00
Brad King
bed7ee11b7 Merge topic 'FindMatlab-cross-compile' 
3434c22c29 FindMatlab: only search registry on windows hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2248
 2018-08-06 08:22:28 -04:00
Brad King
7142041abd Merge topic 'cuda-arch-version' 
37ba34c0b0 FindCUDA/select_compute_arch: Restore two-component CUDA_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2251
 2018-08-06 08:20:54 -04:00
Brad King
37ba34c0b0 FindCUDA/select_compute_arch: Restore two-component CUDA_VERSION 
Since commit v3.12.0-rc1~332^2 (FindCUDA/select_compute_arch: Add
support for CUDA as a language, 2018-03-15) this module sets
`CUDA_VERSION` based on `CMAKE_CUDA_COMPILER_VERSION` when the language
is enabled.  Limit it to two components for consistency with the
normal `FindCUDA` documentation and behavior.

Fixes: #18231
 2018-08-01 13:42:13 -04:00
Brad King
10d6c3a635 NAG: Pass response files through front-end to the linker 
The `nagfor` compiler front-end does not support the `@rspfile` syntax.
Use `-Wl,@rspfile` instead to pass it through to the linker.

Fixes: #18232
 2018-08-01 13:28:45 -04:00
Brad King
c2856e0b2b XL: Use -qpic for position independent executables 
The XL compiler does not have a dedicated "pie" option so use at least
`-qpic`.  This missing setting was exposed by the `ExportImport` and
`PositionIndependentTargets` tests with XL on an ELF platform.
 2018-08-01 11:59:50 -04:00
Jason Heeris
f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler 
Add component `MCC_COMPILER` to request searching for the Matlab
compiler.  Report it in `Matlab_MCC_COMPILER` if it is found.

Issue: #18183
 2018-08-01 09:23:46 -04:00
Julien Schueller
3434c22c29 FindMatlab: only search registry on windows hosts 
From Linux, it fails when cross-compiling
 2018-08-01 07:40:25 -04:00
Brad King
24ff152aa0 Merge topic 'UseSWIG-legacy-user-flags' 
2f88c177d0 UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Julien Schueller <schueller@phimeca.com>
Merge-request: !2245
 2018-08-01 07:21:34 -04:00
Marc Chevrier
2f88c177d0 UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGS 
Fixes: #18226
 2018-07-31 19:33:35 +02:00
Craig Scott
2af5307317 Merge branch 'cpack-default-package-version-zero' into release-3.12 
Merge-request: !2239
 2018-07-29 19:44:24 +10:00
Craig Scott
50e40b7eec Merge topic 'cpack-default-package-version-zero' 
ed015bde2b CPack: Restore support for 0-valued version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2239
 2018-07-29 05:40:37 -04:00
Brad King
5bbcf76399 Merge topic 'UseSWIG-target-name-policy' 
a3a0c3aa71 UseSWIG: add policy to manage target naming strategy.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2232
 2018-07-27 10:08:54 -04:00
Brad King
ed015bde2b CPack: Restore support for 0-valued version components 
In commit v3.12.0-rc1~136^2 (CPack: Use project version as default for
`CPACK_PACKAGE_VERSION`, 2018-04-29) we did not account for the value of
`CMAKE_PROJECT_VERSION_{MAJOR,MINOR,PATCH}` having `0`.  Fix the logic
to distinguish between unprovided version components and `0` components.

While at it, add a test case covering the behavior described in the
documentation by the original commit.  The number of version components
in the package name should match those provided to the `project()`
command `VERSION` option.

Fixes: #18199
 2018-07-27 10:01:29 -04:00
Brad King
c985c97433 Merge topic 'googletest_policy_settings' 
7ddc2a110c GoogleTest: Ensure policy settings allow use of IN_LIST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2237
 2018-07-26 10:08:11 -04:00
Marc Chevrier
a3a0c3aa71 UseSWIG: add policy to manage target naming strategy. 2018-07-25 18:00:52 +02:00
Brad King
946318a1ef Merge topic 'GetPrerequisites-dylibsframeworks' 
dce77d9ad9 GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2229
 2018-07-25 10:24:10 -04:00
Craig Scott
7ddc2a110c GoogleTest: Ensure policy settings allow use of IN_LIST 
If policy settings at the time the GoogleTest module is included are
such that CMP0057 is unset or set to OLD, the use of IN_LIST with
if() will lead to an error. Therefore, explicitly specify the policy
settings for the whole file to ensure the function implementations
have access to the required CMake features.

Fixes: #18198
 2018-07-25 21:30:51 +10:00
Harry Mallon
dce77d9ad9 GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle 
Fixes: #16828
 2018-07-24 14:07:22 -04:00
Brad King
07e223ad37 Merge topic 'FindPython-fix-multiple-calls' 
50921cc04e FindPython*: fix erroneous behavior on multiple 'find_package' calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2228
 2018-07-24 10:58:42 -04:00
Brad King
b5061e02f8 Merge branch 'FindPython-fix-multiple-calls' into release-3.12 
Merge-request: !2228
 2018-07-23 11:08:40 -04:00
Marc Chevrier
50921cc04e FindPython*: fix erroneous behavior on multiple 'find_package' calls 
Fixes: #18192
 2018-07-23 11:08:16 -04:00
Brad King
949c62175e Merge topic 'FindPkgConfig-global-target' 
7aa26cf0e9 FindPkgConfig: allow to create global imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2193
 2018-07-23 11:06:23 -04:00
Rolf Eike Beer
7aa26cf0e9 FindPkgConfig: allow to create global imported targets 2018-07-22 13:33:04 +02:00
Harry Mallon
22554c3166 BundleUtilities: message(FATAL_ERROR) on otool -l error 2018-07-20 12:06:04 +01:00
Brad King
af041b71f7 Merge topic 'tcl-8.7' 
bec3be11b9 FindTCL: Add support for version 8.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2223
 2018-07-19 07:09:03 -04:00
Brad King
018c373f35 Merge topic 'UseSWIG-csharp-conditional' 
ed289e0577 UseSWIG: Use CSharp language only if it is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ram-Z <me@rmz.io>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !2219
 2018-07-19 07:08:31 -04:00
Brad King
a35eafdb22 Merge topic 'csharp-compiler-loaded' 
c3ea50ede1 CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2220
 2018-07-19 07:07:53 -04:00
Brad King
8cefa2cba4 Merge branch 'tcl-8.7' into release-3.12 
Merge-request: !2223
 2018-07-18 13:10:12 -04:00
Dima Panov
bec3be11b9 FindTCL: Add support for version 8.7 
Fixes: #18186
 2018-07-18 13:08:34 -04:00
Brad King
ed289e0577 UseSWIG: Use CSharp language only if it is enabled 
In commit v3.12.0-rc1~2^2 (UseSWIG: Add CSHARP variant for wrapper
files, 2018-06-08) we explicitly marked swig-generated `.cs` files as
`LANGUAGE` CSharp so that the resulting sources can be compiled.
However, this works only when the CSharp language has been enabled.

Fixes: #18184
 2018-07-18 08:53:32 -04:00
Brad King
c3ea50ede1 CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabled 
We already do this for C, CXX, Fortran, etc.
 2018-07-18 08:53:32 -04:00
Brad King
e78fc81d4a Merge topic 'FindProtobuf-upstream-impl' 
71d99e156b Protobuf: restore previous output directory
2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support
1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check
1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2212
 2018-07-17 07:13:18 -04:00
Brad King
689ce111a8 Merge topic 'FindOpenCL-arch-paths' 
dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2215
 2018-07-17 07:11:38 -04:00
André Apitzsch
71d99e156b Protobuf: restore previous output directory 
The protobuf upstream implementation has a different default output
directory.  Restore our original output directory for compatibility.
 2018-07-16 08:59:36 -04:00
André Apitzsch
2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support 
This was not present in the upstream code.
 2018-07-16 08:59:33 -04:00
André Apitzsch
1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check 
This was not present in the upstream code.
 2018-07-16 08:59:21 -04:00
André Apitzsch
1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files 
Generate functions are taken from [1] and [2].  The license [3] is
already covered by our BSD-3 license for CMake and our inclusion of
"Google Inc" in `Copyright.txt`.

[1] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-config.cmake.in
[2] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-module.cmake.in
[3] https://github.com/google/protobuf/blob/93f6b67e/LICENSE
 2018-07-16 08:57:08 -04:00
Anton Myagkov
dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX 
Use different path suffixes to find opencl for x86 and x86_64.
We already do this on Windows.
 2018-07-16 08:27:08 -04:00
Brad King
4b00e57de8 Merge topic 'FindXercesC-versioned-names' 
82f39c9ce9 FindXercesC: Search for version-named library files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2210
 2018-07-16 08:21:55 -04:00
Raul Metsma
82f39c9ce9 FindXercesC: Search for version-named library files 
Use the version number extracted from the header file to construct
versioned library names.  This approach is already used by `FindXalanC`.

Signed-off-by: Raul Metsma <raul@metsma.ee>
 2018-07-13 09:01:47 -04:00
Brad King
0d72c50d29 Merge topic 'intel-std-fix' 
735e69f445 Intel: Fix incorrectly documented extension flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2206
 2018-07-13 08:54:47 -04:00
Brad King
718d2f8f16 Merge topic 'boost-1.68-beta1' 
b76b93c728 FindBoost: Change context header used
c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !2204
 2018-07-13 08:54:16 -04:00
Brad King
e109dc0b2a Merge branch 'intel-std-fix' into release-3.12 
Merge-request: !2206
 2018-07-12 09:36:30 -04:00
Christian Pfeiffer
735e69f445 Intel: Fix incorrectly documented extension flags 
Fixes: #18166
 2018-07-12 09:35:50 -04:00
Brad King
f7f2b8078e Merge topic 'qnx_fix' 
e014df762b QNX: Fix autogen compiler predefines detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2205
 2018-07-12 09:15:58 -04:00
Brad King
f6f5f9f75f Merge topic 'ghs' 
ce4f20ba62 GHS: Add release notes
281c601024 GHS: Update default BSP name
01c98c6ccc GHS: Update setting default OS location for Integrity platforms
bb77dc0cee GHS: Set primary target using arch/platform values (or user specified value)
f80692cf60 GHS: Add platform selection support
a37a4a00c8 GHS: Add toolset selection support
5d40d2b44f GHS: Support ARM, PPC, 86 architectures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Soucy <matthew.soucy@baesystems.com>
Merge-request: !798
 2018-07-12 09:15:18 -04:00
Brad King
384c3f9e9e Merge branch 'boost-1.68-beta1' into release-3.12 
Merge-request: !2204
 2018-07-12 09:10:02 -04:00