summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'UseSWIG-legacy-user-flags'Brad King2018-08-011-3/+4
|\ | | | | | | | | | | | | | | 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
| * UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGSMarc Chevrier2018-07-311-3/+4
| | | | | | | | Fixes: #18226
| * Merge branch 'cpack-default-package-version-zero' into release-3.12Craig Scott2018-07-291-12/+15
| |\ | | | | | | | | | Merge-request: !2239
* | \ Merge topic 'cpack-default-package-version-zero'Craig Scott2018-07-291-12/+15
|\ \ \ | | |/ | |/| | | | | | | | | | | | | ed015bde2b CPack: Restore support for 0-valued version components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2239
| * | CPack: Restore support for 0-valued version componentsBrad King2018-07-271-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'UseSWIG-target-name-policy'Brad King2018-07-271-15/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3a0c3aa71 UseSWIG: add policy to manage target naming strategy. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2232
| * | | UseSWIG: add policy to manage target naming strategy.Marc Chevrier2018-07-251-15/+26
| | | |
* | | | Merge topic 'googletest_policy_settings'Brad King2018-07-261-0/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 7ddc2a110c GoogleTest: Ensure policy settings allow use of IN_LIST Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2237
| * | | GoogleTest: Ensure policy settings allow use of IN_LISTCraig Scott2018-07-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge branch 'FindPython-fix-multiple-calls' into release-3.12Brad King2018-07-231-5/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2228
| * \ \ \ Merge branch 'tcl-8.7' into release-3.12Brad King2018-07-183-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2223
* | \ \ \ \ Merge topic 'GetPrerequisites-dylibsframeworks'Brad King2018-07-251-14/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | dce77d9ad9 GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2229
| * | | | | GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundleHarry Mallon2018-07-241-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16828
* | | | | | Merge topic 'FindPython-fix-multiple-calls'Brad King2018-07-241-5/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 50921cc04e FindPython*: fix erroneous behavior on multiple 'find_package' calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2228
| * | | | | FindPython*: fix erroneous behavior on multiple 'find_package' callsMarc Chevrier2018-07-231-5/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #18192
* | | | | Merge topic 'FindPkgConfig-global-target'Brad King2018-07-231-16/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7aa26cf0e9 FindPkgConfig: allow to create global imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2193
| * | | | | FindPkgConfig: allow to create global imported targetsRolf Eike Beer2018-07-221-16/+31
| | |/ / / | |/| | |
* | | | | BundleUtilities: message(FATAL_ERROR) on otool -l errorHarry Mallon2018-07-201-0/+5
|/ / / /
* | | | Merge topic 'tcl-8.7'Brad King2018-07-193-0/+9
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | bec3be11b9 FindTCL: Add support for version 8.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2223
| * | | FindTCL: Add support for version 8.7Dima Panov2018-07-183-0/+9
| |/ / | | | | | | | | | Fixes: #18186
* | | Merge topic 'UseSWIG-csharp-conditional'Brad King2018-07-191-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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
| * | UseSWIG: Use CSharp language only if it is enabledBrad King2018-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'csharp-compiler-loaded'Brad King2018-07-191-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | c3ea50ede1 CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2220
| * | CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabledBrad King2018-07-181-0/+1
| |/ | | | | | | We already do this for C, CXX, Fortran, etc.
| * Merge branch 'intel-std-fix' into release-3.12Brad King2018-07-122-8/+10
| |\ | | | | | | | | | Merge-request: !2206
| * \ Merge branch 'boost-1.68-beta1' into release-3.12Brad King2018-07-121-4/+23
| |\ \ | | | | | | | | | | | | Merge-request: !2204
* | \ \ Merge topic 'FindProtobuf-upstream-impl'Brad King2018-07-171-99/+143
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Protobuf: restore previous output directoryAndré Apitzsch2018-07-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The protobuf upstream implementation has a different default output directory. Restore our original output directory for compatibility.
| * | | | Protobuf: restore 'DESCRIPTORS' supportAndré Apitzsch2018-07-161-4/+23
| | | | | | | | | | | | | | | | | | | | This was not present in the upstream code.
| * | | | Protobuf: restore 'PROTOBUF_IMPORT_DIRS' checkAndré Apitzsch2018-07-161-0/+8
| | | | | | | | | | | | | | | | | | | | This was not present in the upstream code.
| * | | | Protobuf: use upstream implementation to generate cpp and python filesAndré Apitzsch2018-07-161-104/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'FindOpenCL-arch-paths'Brad King2018-07-171-10/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2215
| * | | | | FindOpenCL: Search per-architecture path suffixes on UNIXAnton Myagkov2018-07-161-10/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | Use different path suffixes to find opencl for x86 and x86_64. We already do this on Windows.
* | | | | Merge topic 'FindXercesC-versioned-names'Brad King2018-07-161-2/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | FindXercesC: Search for version-named library filesRaul Metsma2018-07-131-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge topic 'intel-std-fix'Brad King2018-07-132-8/+10
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 735e69f445 Intel: Fix incorrectly documented extension flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2206
| * | | | Intel: Fix incorrectly documented extension flagsChristian Pfeiffer2018-07-122-8/+10
| | | | | | | | | | | | | | | | | | | | Fixes: #18166
* | | | | Merge topic 'boost-1.68-beta1'Brad King2018-07-131-4/+23
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | FindBoost: Change context header usedRoger Leigh2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | FindBoost: Add support for Boost 1.68 beta1Roger Leigh2018-07-111-3/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | This includes a new component, `Boost::contract`. Fixes: #18167
* | | | Merge topic 'qnx_fix'Brad King2018-07-121-0/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | e014df762b QNX: Fix autogen compiler predefines detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2205
| * | | QNX: Fix autogen compiler predefines detectionCristian Adam2018-07-111-0/+2
| |/ / | | | | | | | | | | | | | | | 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.
| * | Merge branch 'FindLua-CMP0012' into release-3.12Brad King2018-07-031-0/+5
| |\ \ | | | | | | | | | | | | Merge-request: !2189
* | \ \ Merge topic 'ghs'Brad King2018-07-121-28/+32
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | GHS: Update default BSP nameFred Baksik2018-07-111-1/+2
| | | | | | | | | | | | | | | | | | | | -- 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
| * | | GHS: Update setting default OS location for Integrity platformsFred Baksik2018-07-111-26/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -- 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)
| * | | GHS: Set primary target using arch/platform values (or user specified value)Fred Baksik2018-07-111-1/+0
| | | |
* | | | Merge topic 'implicit-link-CMP0054'Brad King2018-07-111-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a353d10a75 Protect implicit link library extraction with policy CMP0054 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2201
| * | | | Protect implicit link library extraction with policy CMP0054Brad King2018-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXXMartin Storsjö2018-07-078-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.