summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'implicit-includes'Brad King2019-03-291-2/+14
|\ | | | | | | | | | | | | | | dad86f1873 ParseImplicitIncludeInfo: Canonicalize implicit include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michel Zou <xantares09@hotmail.com> Merge-request: !3157
| * ParseImplicitIncludeInfo: Canonicalize implicit include dirsBrad King2019-03-291-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | The implicit include directory extraction added by commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) leaves paths like `/usr/lib/../include` unchanged. Fix the logic to canonicalize such paths (e.g. to `/usr/include`) as we do for implicit link directories already. This is important to ensure the set of implicit directories is represented in the same form as the include directories that will be compared to them. Issue: #19095
* | Merge topic 'ifw_group_option_parsing'Brad King2019-03-291-0/+6
|\ \ | | | | | | | | | | | | | | | | | | 6f6e0966a7 CPackIFW: Add missing cpack_ifw_configure_component_group option processing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3160
| * | CPackIFW: Add missing cpack_ifw_configure_component_group option processingClément Rezvoy2019-03-281-0/+6
| |/ | | | | | | | | | | | | | | | | | | Both commit 88ecfd8ba1 (CPackIFW: Add some options, 2016-11-11, v3.8.0-rc1~248^2) and commit e5089c562c (CPackIFW: Add some options, 2017-01-24, v3.8.0-rc1~53^2) added some options to this macro's documentation and implementation, but the actual processing of the parsed options was never added. Add it now. Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
* | Merge topic 'FindFontconfig-var-case'Brad King2019-03-272-29/+29
|\ \ | | | | | | | | | | | | | | | | | | a3a1e69f8a FindFontconfig: Convert module variables to camel case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3153
| * | FindFontconfig: Convert module variables to camel caseBrad King2019-03-262-29/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our documented standard for find module variable names is to match the case of the find module package name. This was overlooked when the module was added by commit 84e7920b3a (FindFontconfig: Add module to find Fontconfig, 2018-09-27, v3.14.0-rc1~523^2). The module was released with the upper case names in CMake 3.14.0, so fix it to have camel case names in 3.14.1. This is incompatible but anyone using a given release series should be using the latest patch on it and we've made breaking fixups on newly released features like this before. Reported-by: Christophe Giboudeaux <christophe@krop.fr> Fixes: #19094
* | Merge topic 'cuda-bracket-output'Brad King2019-03-271-0/+5
|\ \ | | | | | | | | | | | | | | | | | | b127e0c561 CUDA: Tolerate square brackets in PROMPT environment variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3151
| * | CUDA: Tolerate square brackets in PROMPT environment variableBrad King2019-03-261-0/+5
| |/ | | | | | | | | | | | | The `PROMPT` environment variable affects nvcc's output. Fix our parsing of that output to tolerate square brackets. Fixes: #19089
* | Merge topic 'find_dependency-cleanup'Brad King2019-03-271-1/+0
|\ \ | | | | | | | | | | | | | | | | | | 82dec5191c find_dependency: Remove clearing of unused cmake_fd_exact_arg variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3149
| * | find_dependency: Remove clearing of unused cmake_fd_exact_arg variableDamien R2019-03-261-1/+0
| | | | | | | | | | | | | | | | | | The variable is unused since commit ab358d6a85 (Improve find_dependency argument handling, 2017-05-22, v3.9.0-rc1~57^2) where handling of EXACT keyword in find_dependency was reworked.
* | | Merge topic 'toolchain-include_directories'Brad King2019-03-261-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 588fa1bb9e Restore support for include_directories() in toolchain files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3140
| * | Restore support for include_directories() in toolchain filesBrad King2019-03-251-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any `include_directories()` calls in toolchain files are used during our ABI detection step even though it does not include any system headers. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2), that check is also used to detect implicit include directories. Any `include_directories()` in a toolchain file are detected as implicit and later excluded from explicit specification on compiler command lines, thus breaking the purpose of the calls in the first place. Fix the implicit include directory detection step to avoid using paths from `include_directories()` calls in the toolchain file. Fixes: #19079
* | Merge topic 'pkg-get-variable-prefix-path'Brad King2019-03-251-109/+128
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | f401a57160 pkg_get_variable now sets PKG_CONFIG_PATH like pkg_check_modules 4d76941924 FindPkgConfig: hoist PKG_CONFIG_PATH ops out into _pkg_set_path_internal 78f23de70c More tests for pkg_get_variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3131
| * | pkg_get_variable now sets PKG_CONFIG_PATH like pkg_check_modulesDan Kegel2019-03-201-24/+34
| | | | | | | | | | | | Fixes: #15805
| * | FindPkgConfig: hoist PKG_CONFIG_PATH ops out into _pkg_set_path_internalDan Kegel2019-03-201-89/+98
| | |
* | | Merge topic 'ghs-linux'Brad King2019-03-223-4/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c43fb5be3 FindThreads: Fix pthread library check in GHS Multi Generator 0404efe786 GHS: Add support for GHS Multi Generator in Linux 2060a1445c Tests: Fix file name case in GHS object library test ddad70c8a4 Tests: Run GHS tests in a separate ctest process f7dca1fc97 GHS: Fix include-what-you-use and clang-tidy diagnostics Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3006
| * | | FindThreads: Fix pthread library check in GHS Multi GeneratorNaren Manimohan2019-03-211-0/+3
| | | |
| * | | GHS: Add support for GHS Multi Generator in LinuxNaren Manimohan2019-03-212-4/+16
| | | |
* | | | Merge topic 'dont_do_compiler_feature_checks_for_version_with_no_features'Brad King2019-03-211-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85415afbdc CompileFeatures: Don't try_compile for language levels with no features 616282a5ce CMake: Provide language level compile features lists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3128
| * | | | CompileFeatures: Don't try_compile for language levels with no featuresRobert Maynard2019-03-201-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously Compilers always had to run a try_compile to determine what language level each feature mapped to. Now we can skip the try_compile when a language level has no features.
* | | | | Merge topic 'Find-prefix-paths'Brad King2019-03-218-66/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eea9eda834 remove some platform specific search paths from Find modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3122
| * | | | | remove some platform specific search paths from Find modulesRolf Eike Beer2019-03-198-66/+3
| | | | | | | | | | | | | | | | | | | | | | | | These are added through CMAKE_SYSTEM_PREFIX_PATH on the platforms automatically.
* | | | | | Merge topic 'armcc-compiler-id'Brad King2019-03-211-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f8d056051 ARMCC: Fix identification of ARM compiler when it defines GNU macros Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3127
| * | | | | ARMCC: Fix identification of ARM compiler when it defines GNU macrosBrad King2019-03-201-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to ARMCC 5.06 documentation: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0472m/chr1359125007083.html the compiler may define `__GNUC__` in addition to `__ARMCC_VERSION`. Re-order our preprocessor checks to consider the ARM-specific macro first so that the ARM compiler is not mistaken for a GNU compiler. Fixes: #19065
* | | | | ExternalProject: Optimize Mercurial commandsBartosz Kosiorek2019-03-191-12/+5
| | | | |
* | | | | ExternalProject: Optimize git commandsBartosz Kosiorek2019-03-191-23/+18
| |/ / / |/| | |
* | | | Merge topic 'CheckTypeSize-decl-warning'Brad King2019-03-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0adb0e0178 CheckTypeSize: Fix with clang '-Werror,-Wmissing-variable-declarations' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3112
| * | | | CheckTypeSize: Fix with clang '-Werror,-Wmissing-variable-declarations'Campbell Barton2019-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve issue building with missing variable declarations, error: ``` /src/cmake_clang/CMakeFiles/CheckTypeSize/CMAKE_SIZEOF_UNSIGNED_LONG.c:24:6: error: no previous extern declaration for non-static variable 'info_size' [-Werror,-Wmissing-variable-declarations] char info_size[] = {'I', 'N', 'F', 'O', ':', 's','i','z','e','[', ^ 1 error generated. ```
* | | | | Merge topic 'FindBLAS-mklroot'Brad King2019-03-191-0/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90b7758489 FindBLAS: respect MKLROOT and MKL_ROOT if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3108
| * | | | | FindBLAS: respect MKLROOT and MKL_ROOT if availableMario Emmenlauer2019-03-151-0/+26
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #19052
* | | | | Merge topic 'environment-modules'Brad King2019-03-191-0/+333
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfea916d3c FindEnvModules: Provide a CMake interface to environment modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3076
| * | | | | FindEnvModules: Provide a CMake interface to environment modulesChuck Atkins2019-03-181-0/+333
| | | | | |
* | | | | | Merge topic 'cray-bad-compiler-option'Brad King2019-03-191-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c213e34d0c cray: Detect bad options passed on the command line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3110
| * | | | | | cray: Detect bad options passed on the command lineChuck Atkins2019-03-151-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'ExternalProject-optimize-git'Brad King2019-03-181-38/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c58f5e116e ExternalProject: Extend documentation about GIT_TAG usage 8355665f8d ExternalProject: Drop unnecessary 'git submodule init' 00b5f1a1b5 ExternalProject: Simplify generated 'git clone' scripts 98e6822fdf ExternalProject: Re-run 'git clone' when GIT_REMOTE_NAME changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3095
| * | | | | | ExternalProject: Extend documentation about GIT_TAG usageBartosz Kosiorek2019-03-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GIT_SHALLOW is used, the '--depth 1 --no-single-branch' arguments are add. It means that only branch names and tags is downloaded to repository. Most Commit Hash is not working. With this commit the documentation was updated, to describe the limitation of GIT_SHALLOW.
| * | | | | | ExternalProject: Drop unnecessary 'git submodule init'Bartosz Kosiorek2019-03-141-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 79410eeb1f (ExternalProject: Initialize Git submodules recursively and on update (#16083), 2016-04-26, v3.6.0-rc1~105^2) our `git submodule update` step uses the `--init` flag. This makes the prior `git submodule init` unnecessary.
| * | | | | | ExternalProject: Simplify generated 'git clone' scriptsBartosz Kosiorek2019-03-141-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise script generation to hard-code selected options instead of building them with logic inside the script.
| * | | | | | ExternalProject: Re-run 'git clone' when GIT_REMOTE_NAME changesBartosz Kosiorek2019-03-141-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindGLEW-updates'Brad King2019-03-181-33/+269
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a77a30e657 FindGLEW: Add test a7d853868b FindGLEW: Update implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3094
| * | | | | | FindGLEW: Update implementationClaudio Fantacci2019-03-151-33/+269
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replicate behaviour of upstream GLEW. * define the imported target GLEW::glew for the shared library GLEW * if GLEW_USE_STATIC_LIBS is defined and set to TRUE, this module instead defines the imported target GLEW::glew_s for the static library GLEW * an imported target GLEW::GLEW is created as a copy of either GLEW::glew or GLEW::glew_s * by setting GLEW_VERBOSE you print out the log of the module. Fixes: #17638, #17864, #18989
* | | | | | Merge topic 'pkg-config-linker-flags'Marc Chevrier2019-03-161-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b759fa9b8e FindPkgConfig: Set linker flags on imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3082
| * | | | | | FindPkgConfig: Set linker flags on imported targetsRadek Nadstawny2019-03-131-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'FindPython-ensure-correct-architecture-selected'Brad King2019-03-154-8/+29
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a84cb1663 FindPython*: ensure correct architecture is selected. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3103
| * | | | | FindPython*: ensure correct architecture is selected.Marc Chevrier2019-03-144-8/+29
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure interpreter and libraries architecture matches CMake build configuration. Update documentation about interpreter constraints. Fixes: #19024
| * | | | Merge branch 'ios-variable' into release-3.14Brad King2019-03-051-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3051
* | \ \ \ \ Merge topic 'FindBoost-dyn-link'Brad King2019-03-121-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05774d4b58 FindBoost: always define BOOST_ALL_DYN_LINK for Boost::dynamic_linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3083
| * | | | | FindBoost: always define BOOST_ALL_DYN_LINK for Boost::dynamic_linkingNeroBurner2019-03-111-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of the `Boost::dynamic_linking` interface library is to cause `BOOST_ALL_DYN_LINK` to be defined. Do this on all platforms instead of just Windows. In particular, using Boost::log trivial_logger requires to set BOOST_ALL_NO_LIB when Boost::Log is compiled as dynamic library. Fixes: #17813
* | | | | Merge topic 'FindSWIG-advanced-exe'Brad King2019-03-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4fe56a67d9 FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache display Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3077
| * | | | FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache displaySylvain Joubert2019-03-081-1/+1
| | |_|/ | |/| |