summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cuda-arch-version' into release-3.12Brad King2018-08-011-2/+3
|\ | | | | | | 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
* | 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
| * | 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
* | 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
| * | FindPython*: fix erroneous behavior on multiple 'find_package' callsMarc Chevrier2018-07-231-5/+1
| |/ | | | | | | Fixes: #18192
* | Merge branch 'tcl-8.7' into release-3.12Brad King2018-07-183-0/+9
|\ \ | | | | | | | | | Merge-request: !2223
| * | FindTCL: Add support for version 8.7Dima Panov2018-07-183-0/+9
| |/ | | | | | | Fixes: #18186
* | 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
* | 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
| * Intel: Fix incorrectly documented extension flagsChristian Pfeiffer2018-07-122-8/+10
| | | | | | | | Fixes: #18166
* | Merge branch 'boost-1.68-beta1' into release-3.12Brad King2018-07-121-4/+23
|\ \ | | | | | | | | | 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
* | 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
| * FindLua: Set CMP0012 to NEW for the revised search codeAdriaan de Groot2018-07-031-0/+5
| | | | | | | | | | | | | | | | 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
* | UseSWIG: reintroduce legacy target name managementMarc Chevrier2018-07-031-53/+111
|/ | | | Fixes: #18140
* Merge branch 'FindOpenMP-avoid-warning-in-check' into release-3.12Brad King2018-06-271-1/+1
|\ | | | | | | Merge-request: !2176
| * FindOpenMP: Avoid warning in check codeBrad King2018-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'FindJPEG-fix-debug' into release-3.12Brad King2018-06-211-7/+1
|\ \ | | | | | | | | | Merge-request: !2159
| * | FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variablesAndrey Karpov2018-06-211-6/+0
| | | | | | | | | | | | These have been deprecated since 2002!
| * | FindJPEG: Add forgotten names of libraries for Debug configurationAndrey Karpov2018-06-211-1/+1
| |/ | | | | | | | | | | 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.
* | Merge branch 'xcode-10-archs' into release-3.12Brad King2018-06-196-12/+14
|\ \ | | | | | | | | | Merge-request: !2153
| * | Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCHBrad King2018-06-186-12/+14
| |/ | | | | | | | | | | | | | | | | 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
* | FindCURL: Rename imported target to match upstream CURLBrad King2018-06-181-5/+5
|/ | | | | | | | | | | 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
* Merge branch 'UseSWIG-csharp-variant' into release-3.12Brad King2018-06-131-2/+7
|\ | | | | | | Merge-request: !2137
| * UseSWIG: Add CSHARP variant for wrapper filesRishi Theivendran2018-06-121-2/+7
| | | | | | | | | | Issue: #18065 Fixes: #18066
* | Merge branch 'UseSWIG-fix-genex' into release-3.12Brad King2018-06-121-7/+7
|\ \ | | | | | | | | | Merge-request: !2143
| * | UseSWIG: add support for generator expressionsMarc Chevrier2018-06-121-7/+7
| |/
* | Merge branch 'UseSWIG-handle-SWIG_MODULE_NAME' into release-3.12Brad King2018-06-121-1/+1
|\ \ | | | | | | | | | Merge-request: !2145
| * | UseSWIG: Fix handling of `SWIG_MODULE_NAME` source file propertyFelix Schwitzer2018-06-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Fix a typo from commit 0bef9eb410 (UseSWIG: modernize module, 2018-01-29) that caused `UseSWIG` to ignore an eventually set property `SWIG_MODLUE_NAME`. Building multiple python modules using the mentioned property as described in the docs could lead to an invalid, or even worse, inconsistent `build.ninja` file. The reason is that the generated list of support files was not unique. For each module the support file was always named the same, namely `path/to/builddir/MODULENAME.py`.
* | Merge branch 'FindPython-3.8' into release-3.12Brad King2018-06-083-3/+3
|\ \ | | | | | | | | | Merge-request: !2140
| * | FindPython: Add support for version 3.8Marcel Plch2018-06-083-3/+3
| |/ | | | | | | Python 3.7 is about to be released, making the development version 3.8.
* | Help: Package without components should use 'check_required_components' tooRuslan Baratov2018-06-071-7/+9
|/ | | | | | | | | Macro 'check_required_components' should be called even if there are no components provided by package. This will make sure error is reported in next cases: find_package(Foo CONFIG REQUIRED oops) # 'oops' treated as component find_package(Foo CONFIG REQUIRED COMPONENTS foo) # no components expected
* Merge topic 'intel-compile-features'Brad King2018-06-051-1/+1
|\ | | | | | | | | | | | | f719a13c28 Features: Add special case to disable relaxed constexpr for Intel 18 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2133
| * Features: Add special case to disable relaxed constexpr for Intel 18Brad King2018-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | Intel compilers define `__cpp_constexpr` to `200704` even in C++14 mode. This indicates that the `cxx_relaxed_constexpr` feature is not available. However, Intel 17 and above document support for it. In commit v3.8.0~9^2 (Features: Update features for Intel C++ 17.0.2 on UNIX, 2017-03-31) we added a special check for this case. Intel 17 and 19 work. However, Intel 18 does not seem to work and fails our test case. Add a special case to disable the feature for Intel 18.
* | Merge topic 'more-misc-typos'Brad King2018-06-056-11/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | be28106880 Fix misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !2130
| * | Fix misc. typosluz.paz2018-06-046-11/+11
| | | | | | | | | | | | Found via `codespell` and `grep`
* | | Merge topic 'ep-support-passing-var-ending-with-notfound'Brad King2018-06-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7ad5165c67 ExternalProject: Fix cache generation when args end with "-NOTFOUND" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2127
| * | | ExternalProject: Fix cache generation when args end with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the fix in commit v3.11.0-rc4~8^2 (ExternalProject: Fix cache generation when last args ends with "-NOTFOUND", 2018-03-10) to work for any argument rather than just the last one. ExternalProject can now successfully generate the cache file when any (not only the last one) cache variable associated with either `CMAKE_CACHE_ARGS` or `CMAKE_DEFAULT_CACHE_ARGS` configure step option is set to a `<value>` ending with `-NOTFOUND`.
* | | | Merge topic 'fix/CPackNuGet-var-para-deindent'Craig Scott2018-06-051-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afcb68a0c1 Help: Fix indentation for `CPACK_NUGET_PACKAGE_AUTHORS` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2135
| * | | | Help: Fix indentation for `CPACK_NUGET_PACKAGE_AUTHORS`Alex Turbov2018-06-051-2/+2
| | | | |
* | | | | Merge topic 'external-project-url-hash-docs'Craig Scott2018-06-051-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 470ff56e5a ExternalProject: Improve URL_HASH argument description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2134
| * | | | ExternalProject: Improve URL_HASH argument descriptionMatt McCormick2018-06-041-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The previous documentation suggested ALGO=MD5=d7a3dc7757a35df3dbb890f7dee0976b for example.
* | | | Merge topic 'fix-ti-c-standard'Brad King2018-06-041-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e27881bb1 TI: Add support for C language standards Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2131
| * | | | TI: Add support for C language standardsArnaud Gelas2018-06-041-0/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Set C90 and C99 compile options for TI compiler. Fixes: #18061