summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindZLIB: Fix path detection via ProgramFiles env variablesAndreas Schneider2018-08-241-3/+5
|
* doc: Consistently use <PackageName> for describing the name of a packageJean-Christophe Fillion-Robin2018-08-143-9/+9
|
* Merge topic 'intel-windows-xilib'Brad King2018-08-091-1/+1
|\ | | | | | | | | | | | | | | ef6a08f6f7 Intel: Use xilib as librarian on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christian Pfeiffer <cpfeiffer@live.de> Merge-request: !2265
| * Intel: Use xilib as librarian on WindowsyrHeTaTeJlb2018-08-071-1/+1
| | | | | | | | | | | | | | | | We already use `xilink` instead of `link`, so use `xilib` instead of lib too. Suggested-by: Christian Pfeiffer <cpfeiffer@live.de> Issue: #18240
* | Merge topic 'xerces-version-fix'Brad King2018-08-071-4/+4
|\ \ | |/ |/| | | | | | | | | 00a5836a3d FindXercesC: Correct order of version detection and versioned library checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2259
| * FindXercesC: Correct order of version detection and versioned library checksRoger Leigh2018-08-031-4/+4
| |
* | Merge topic 'nag-fortran-rsp'Brad King2018-08-061-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 10d6c3a635 NAG: Pass response files through front-end to the linker Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2250
| * | NAG: Pass response files through front-end to the linkerBrad King2018-08-011-0/+1
| |/ | | | | | | | | | | | | The `nagfor` compiler front-end does not support the `@rspfile` syntax. Use `-Wl,@rspfile` instead to pass it through to the linker. Fixes: #18232
* | Merge topic 'xl-exe-pic'Brad King2018-08-061-0/+1
|\ \ | | | | | | | | | | | | | | | | | | c2856e0b2b XL: Use -qpic for position independent executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2249
| * | XL: Use -qpic for position independent executablesBrad King2018-08-011-0/+1
| |/ | | | | | | | | | | 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.
* | Merge topic 'FindMatlab-mcc'Brad King2018-08-061-1/+22
|\ \ | | | | | | | | | | | | | | | | | | f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2233
| * | FindMatlab: Add component to find MCC, the Matlab compilerJason Heeris2018-08-011-1/+22
| |/ | | | | | | | | | | | | Add component `MCC_COMPILER` to request searching for the Matlab compiler. Report it in `Matlab_MCC_COMPILER` if it is found. Issue: #18183
* | Merge topic 'FindMatlab-cross-compile'Brad King2018-08-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 3434c22c29 FindMatlab: only search registry on windows hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2248
| * | FindMatlab: only search registry on windows hostsJulien Schueller2018-08-011-1/+1
| |/ | | | | From Linux, it fails when cross-compiling
* | Merge topic 'cuda-arch-version'Brad King2018-08-061-2/+3
|\ \ | |/ |/| | | | | | | | | 37ba34c0b0 FindCUDA/select_compute_arch: Restore two-component CUDA_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2251
| * FindCUDA/select_compute_arch: Restore two-component CUDA_VERSIONBrad King2018-08-011-2/+3
| | | | | | | | | | | | | | | | | | | | 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
* | 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
View Lorry Controller Status