Commit Graph

8599 Commits

Author SHA1 Message Date
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
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
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
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
Brad King
826bf5c454 FindOpenMP: Avoid warning in check code
The test code added by commit v3.12.0-rc1~411^2~1 (FindOpenMP: Verify in
test source that OMP library is linked, 2018-03-01) leaves an unused
variable warning.  This breaks the check with `-Werror`.  Remove the
variable and leave just the function call, which should still check that
the OMP library is linked.

Fixes: #18102
2018-06-27 15:24:22 -04:00
Matt Powley
df2875b58d FindBoost: Update MSVC architecture check code style 2018-06-27 14:55:49 -04:00
Daniel Wyatt
611ad19499 CPack/RPM: Use CMAKE_COMMAND to reference cmake executable
Ensure we use the `cmake` corresponding to the running `cpack`
even if it is not first in `PATH` or has had its name changed.
This was accidentally left out in commit v3.7.0-rc1~81^2 (CPack/RPM:
Generate source rpm (SRPM) packages on demand, 2016-09-19).
2018-06-26 13:25:08 -04:00
Brad King
44ca3d922c Merge topic 'cpack-generator-documentation'
57e4c51e8a Help: Update old version release notes for CPack generator docs
4181830881 Help: Add release notes for CPack generator documentation and module updates
48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory
2a2829cc75 Help: Add new section for CPack generators
be6267808a CPackIFW: Turn documentation into a block comment
0180524c7a Help: Move legacy CPack modules into separate section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2149
2018-06-22 09:48:00 -04:00
Brad King
7b46f59ee1 Merge topic 'FindJPEG-fix-debug'
ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2159
2018-06-22 09:15:47 -04:00
Kyle Edwards
48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory
These modules are not meant to be included by user code, they are
only an internal implementation detail for CPack. Having them live
in the main Modules directory with documentation was misleading, so
they have been moved into Modules/Internal/CPack, and their
documentation has been stripped following its move into the new
"CPack Generators" section. No-op modules which contained only
documentation have been removed entirely.

The only module that hasn't been moved is CPackIFW, because it
contains user-facing macros which would be lost if it were moved.
So, the CPackIFW module has been updated with a note explaining what
needs to (eventually) happen.
2018-06-21 11:00:28 -04:00
Kyle Edwards
2a2829cc75 Help: Add new section for CPack generators
The documentation for CPack generators previously lived in their
respective internal CMake modules. This setup was misleading,
because it implied that you should include the modules in your own
code, which is not the case. Moving the documentation into a
separate section does a better job of hiding the internal modules,
which are just an implementation detail. The generator documentation
has also been modified to remove any references to the module name.

The CPackIFW module is a special exception: since it has user-facing
macros, the documentation for these macros has been kept in the module
page, while all other documentation related to the IFW generator has
been moved into the new section.

To make it easier to find the new documentation, the old help pages
for the CPack*.cmake modules have not been deleted, but have been
replaced with a link to their respective help page in the new
documentation section.
2018-06-21 11:00:25 -04:00
Kyle Edwards
be6267808a CPackIFW: Turn documentation into a block comment 2018-06-21 10:57:29 -04:00
Brad King
5dc9f440c5 Merge branch 'FindJPEG-fix-debug' into release-3.12
Merge-request: !2159
2018-06-21 10:50:48 -04:00
Andrey Karpov
ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
These have been deprecated since 2002!
2018-06-21 10:47:03 -04:00
Andrey Karpov
7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration
The change in commit v3.12.0-rc1~202^2~1 (FindJPEG: Add multi config
support and associated docs, 2018-04-17) accidentally left out the
default jpeg library names from consideration for debug variants.
2018-06-21 10:47:03 -04:00
Brad King
e893c53b8c Merge topic 'xcode-10-archs'
bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2153
2018-06-19 10:54:28 -04:00
Brad King
65f73c0ae1 Merge topic 'FindCURL-target-name'
1e356734a7 FindCURL: Rename imported target to match upstream CURL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2154
2018-06-19 09:25:44 -04:00
Brad King
a044006a32 Merge branch 'xcode-10-archs' into release-3.12
Merge-request: !2153
2018-06-19 09:24:37 -04:00
Brad King
1e356734a7 FindCURL: Rename imported target to match upstream CURL
Upstream CURL provides imported target `CURL::libcurl`.  Rename the
target added by `FindCURL` to match.  We don't need compatibility with
the old name because it has never been in a CMake release (except a 3.12
release candidate).

Suggested-by: Jakub Zakrzewski <slither.jz@gmail.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Fixes: #18091
2018-06-18 13:58:21 -04:00
Brad King
bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH
Xcode 10 no longer populates `CURRENT_ARCH` with the current
architecture in shell scripts and instead uses `undefined_arch`.
Instead we must use `ARCHS`.  It lists all architectures separated by
spaces.

Fixes: #18085
2018-06-18 13:44:43 -04:00
Marc Chevrier
08f2a2408d UseSWIG: add support of target property INCLUDE_DIRECTORIES consumption
Fixes: #18003
2018-06-13 17:46:16 +02:00
Brad King
93fe9fc1a2 Merge branch 'UseSWIG-csharp-variant' into release-3.12
Merge-request: !2137
2018-06-13 10:51:49 -04:00
Brad King
0247f6836c Merge topic 'UseSWIG-csharp-variant'
0c2fb4c896 UseSWIG: Add CSHARP variant for wrapper files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2137
2018-06-13 10:48:51 -04:00