mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 21:09:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,171 Commits 2 Branches 393 Tags
873f40ecec50fbe6c8e98a0764c02a423dbfa05b
Commit Graph

8618 Commits

Author SHA1 Message Date
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
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
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
Roger Leigh
b76b93c728 FindBoost: Change context header used 
boost/context/all.hpp is removed in Boost 1.68.
boost/context/detail/fcontext.hpp is present in all Boost
releases containing context (≥1.61).
 2018-07-11 23:14:21 +01:00
Cristian Adam
e014df762b QNX: Fix autogen compiler predefines detection 
In commit v3.12.0-rc1~20^2 (Move GNU COMPILER_PREDEFINES_COMMAND from
Platform to Compiler, 2018-06-01), `Compiler/GNU.cmake` introduced the
`-dM` flag, which requires `-Wp` prefix for the QNX compiler wrapper.
 2018-07-11 09:54:49 -04:00
Fred Baksik
281c601024 GHS: Update default BSP name 
-- Use default value of sim<arch> if not user defined
-- Also no reason to trim quotes or changes slashes; it is just a name not a path
 2018-07-11 08:48:23 -04:00
Fred Baksik
01c98c6ccc GHS: Update setting default OS location for Integrity platforms 
-- Update how the latest OS is determined; scan the location GHS_OS_ROOT and sort it
   No longer use registry settings looking for installations
     The registry values are assigned in installation order for Green Hills tools not version order
   Filter out files from the list of directories (i.e if int1234.zip and int1234 are both in root folder)
 2018-07-11 08:46:26 -04:00
Fred Baksik
bb77dc0cee GHS: Set primary target using arch/platform values (or user specified value) 2018-07-11 08:44:49 -04:00
Roger Leigh
c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1 
This includes a new component, `Boost::contract`.

Fixes: #18167
 2018-07-11 07:26:51 -04:00
Brad King
cd7fad9cf3 Merge topic 'implicit-link-CMP0054' 
a353d10a75 Protect implicit link library extraction with policy CMP0054

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2201
 2018-07-11 07:22:05 -04:00
Brad King
a353d10a75 Protect implicit link library extraction with policy CMP0054 
CMakeParseImplicitLinkInfo tests arbitrary content with `if(MATCHES)`.
Set policy CMP0054 to ensure the line content is never interpreted as a
variable reference (which may also produce a CMP0054 warning).

While at it, also set policy CMP0053 to improve performance.
 2018-07-10 09:31:24 -04:00
Martin Storsjö
de5a4653d7 Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXX 
Just like the existing WindowsPhone and WindowsStore platform modules
for MSVC, just include the corresponding Windows platform modules.

MinGW tools (both with GCC and Clang) can be used for building for
Windows Store, even though it isn't a very common or simple setup.
 2018-07-08 00:06:37 +03:00
Brad King
edfeeba347 Merge topic 'FindCURL-per-config' 
59b3e78451 FindCURL: Find debug and release variants separately
6a9fe250a7 FindCURL: Improve CURL::libcurl property code layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1940
 2018-07-06 09:42:31 -04:00
Brad King
7f9652773a Merge topic 'UseSWIG-legacy-targets' 
8f2b483c06 Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets
38ffcedd26 UseSWIG: reintroduce legacy target name management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2188
 2018-07-05 11:39:09 -04:00
Brad King
5c60e80c46 Merge topic 'FindLua-CMP0012' 
91f4adb028 FindLua: Set CMP0012 to NEW for the revised search code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !2189
 2018-07-05 11:38:03 -04:00
Hiroshi Miura
59b3e78451 FindCURL: Find debug and release variants separately 
Fixes: #17887
 2018-07-03 13:40:49 -04:00
Hiroshi Miura
6a9fe250a7 FindCURL: Improve CURL::libcurl property code layout 2018-07-03 13:31:48 -04:00
Brad King
890be0145d Merge branch 'FindLua-CMP0012' into release-3.12 
Merge-request: !2189
 2018-07-03 12:54:24 -04:00
Brad King
8f2b483c06 Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets 
Resolve conflicts by integrating changes from both sides.
 2018-07-03 12:48:02 -04:00
Marc Chevrier
38ffcedd26 UseSWIG: reintroduce legacy target name management 
Fixes: #18140
 2018-07-03 12:46:59 -04:00
Adriaan de Groot
91f4adb028 FindLua: Set CMP0012 to NEW for the revised search code 
Code added by commit v3.12.0-rc1~53^2 (FindLua: Search for lua.h using
more conventional paths, 2018-05-20) depends on `CMP0012` NEW behavior.
Set the policy explicitly for the scope of the FindLua module.

Fixes: #18142
 2018-07-03 11:23:22 -04:00
Kyle Edwards
80914d88da CPack: Add "CPack External" generator 
This generator doesn't actually package the files. Instead, it
provides a metadata JSON file that can be used by external packaging
software to do its own packaging. This JSON file provides information
about the components, component groups, installation types, and CMake
projects.
 2018-07-02 09:51:02 -04:00
Brad King
38db92f668 Merge topic 'FindBoost-arch-check-style' 
df2875b58d FindBoost: Update MSVC architecture check code style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2172
 2018-06-29 09:02:28 -04:00
Brad King
aa8fe65cd7 Merge topic 'cpackrpm-cmake_command' 
611ad19499 CPack/RPM: Use CMAKE_COMMAND to reference cmake executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2168
 2018-06-29 09:01:52 -04:00
Brad King
da1f533696 Merge topic 'FindOpenMP-avoid-warning-in-check' 
826bf5c454 FindOpenMP: Avoid warning in check code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !2176
 2018-06-29 08:57:10 -04:00
Brad King
d43c9152a6 Merge branch 'FindOpenMP-avoid-warning-in-check' into release-3.12 
Merge-request: !2176
 2018-06-27 15:27:21 -04:00