summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable'Brad King2019-05-061-3/+6
|\ | | | | | | | | | | | | 34c0293532 FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3287
| * FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctlyMarc Chevrier2019-05-051-3/+6
| |
| * Merge branch 'FindPython-NumPy-fix-dependencies-management' into release-3.14Brad King2019-04-301-9/+13
| |\ | | | | | | | | | Merge-request: !3274
* | \ Merge topic 'SWIG'Brad King2019-05-061-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e3919bae17 UseSWIG: Manage alternate library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3241
| * | | UseSWIG: Manage alternate library nameMarc Chevrier2019-05-031-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manage alternate library name by passing -interface <library_name> for python language or -dllimport <library_name> for CSharp language to the SWIG compiler. Fixes: #18771
* | | | Merge topic 'findice-clang-cl'Brad King2019-05-061-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3284
| * | | FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_IDjspam2019-05-031-2/+2
| | | | | | | | | | | | This applies commit d48bf97f, which does the same for FindBoost, to FindIce.
* | | | Merge topic 'DetermineCompilerId-versioned-llvm-for-vs'Brad King2019-05-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3281
| * | | | CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio.Zufu Liu2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports versioned LLVM toolsets like LLVM_v142, LLVM_v141, LLVM_v141_xp, etc. for Visual Studio (2010 and later). The name for versioned LLVM toolsets has "LLVM_" prefix plus MSVC toolset name (i.e. v142, v141, v141_xp, etc.). Fixes: #19203
* | | | | Merge topic 'memorize_cxx_compilers_with_full_CXX14_support'Brad King2019-05-033-0/+16
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 3dbec53255 CompileFeatures: Record when compilers gained full CXX14 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3280
| * | | | CompileFeatures: Record when compilers gained full CXX14 supportRobert Maynard2019-05-023-0/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use the infrastructure added by commit 646fb1a646 (CompileFeatures: memoize C++ compilers with full language level support, 2019-03-27) to avoid using a `try_compile` to check for C++14 feature support when the running compiler is known to have all features.
* | | | Merge topic 'ios_fixes'Brad King2019-05-021-4/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4783b842ba iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined 5f5e3062cf iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs 94c5fa5f7a iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values 1011350694 iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3273
| * | | | iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not definedAlexandru Croitor2019-04-301-3/+9
| | | | | | | | | | | | | | | | | | | | This allows overriding them in a toolchain file.
| * | | | iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHsAlexandru Croitor2019-04-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both CMAKE_FIND_ROOT_PATH_MODE_INCLUDE and CMAKE_FIND_ROOT_PATH_MODE_LIBRARY are set to "ONLY" when cross building to iOS, but appears that CMAKE_FIND_ROOT_PATH_MODE_PACKAGE was overlooked. This causes packages to be searched for in the host system as well, which is incorrect and can lead to linking issues. Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE to "ONLY" as well. CMAKE_FIND_ROOT_PATH_MODE_PROGRAM is not touched, because a user might want to find programs / tools on the host system.
| * | | | iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH valuesAlexandru Croitor2019-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the value is hardcoded to contain only the sysroot for the respective darwin platform. This means that it can not be changed in a custom toolchain file. Instead of overriding the value, simply append it. This is similar to how it is done in the Google provided Android toolchain file. The usecase is to allow specifying addiitonal roots to look for 3rd party packages which are definitely not present in the default sysroot.
| * | | | iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain fileAlexandru Croitor2019-04-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently CMAKE_MACOSX_BUNDLE is always set to true when compiling for iOS. This poses a problem when using the source file variant of try_compile. Even if a custom value is passed via the CMAKE_FLAGS option, it would still be overridden by the Darwin.cmake file. Only set the value in case no other value was provided before.
* | | | | Merge topic 'cpackrpm.debug'Brad King2019-05-021-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | d9beea0cca CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUG Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3271
| * | | | CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUGHarry Mallon2019-04-301-1/+3
| |/ / /
* | | | Merge topic 'IAR_6_x_fix'Brad King2019-05-012-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d78bea5df IAR: Fail early in case of IAR ARM 4.XX 0b684524ac IAR: Fix building with IAR ARM 6.X Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3263
| * | | | IAR: Fail early in case of IAR ARM 4.XXDaniel Schürmann2019-04-262-0/+8
| | | | | | | | | | | | | | | | | | | | This version is not yet supported because it uses xlink unsetad of ilink.
| * | | | IAR: Fix building with IAR ARM 6.XDaniel Schürmann2019-04-252-3/+4
| | | | | | | | | | | | | | | | | | | | Use the correct version macros and version numbers.
* | | | | Merge topic 'iar-binutils'Brad King2019-05-011-11/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01a4eec446 IAR: Changes required for Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3262
| * | | | | IAR: Changes required for LinuxStefan Andersson2019-04-251-11/+14
| |/ / / /
* | | | | Merge topic 'memorize_cxx_compilers_with_full_CXX11_support'Brad King2019-05-015-17/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d45a2ffe0 CompileFeatures: Record when compilers gained full CXX11 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3232
| * | | | | CompileFeatures: Record when compilers gained full CXX11 supportRobert Maynard2019-04-295-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the infrastructure added by commit 646fb1a646 (CompileFeatures: memoize C++ compilers with full language level support, 2019-03-27) to avoid using a `try_compile` to check for C++11 feature support when the running compiler is known to have all features.
* | | | | | Merge topic 'FindPython-NumPy-fix-dependencies-management'Brad King2019-05-011-9/+13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 68c8201711 FindPython: NumPy: fix erroneous dependencies management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3274
| * | | | | FindPython: NumPy: fix erroneous dependencies managementMarc Chevrier2019-04-301-9/+13
| | | | | |
* | | | | | Merge topic 'FindBoost-fix-fiber-compiler-features'Brad King2019-05-011-3/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f06bf0fa57 FindBoost: Fix compiler features for `fiber` and `context` 684338aff6 FindBoost: Record compiler features for Boost 1.67 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3266
| * | | | | FindBoost: Fix compiler features for `fiber` and `context`Alex Turbov2019-04-301-0/+2
| | | | | |
| * | | | | FindBoost: Record compiler features for Boost 1.67 and aboveAlex Turbov2019-04-301-3/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Remove the 1.67 upper-bound on compiler feature computation so that with newer versions we at least get it mostly right. Leave a comment with notes about updating features for future versions.
| * | | | Merge branch 'findqt3-hints-fix' into release-3.14Brad King2019-04-221-5/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3254
| * \ \ \ \ Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14Brad King2019-04-171-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3236
| * \ \ \ \ \ Merge branch 'Boost-Gentoo' into release-3.14Brad King2019-04-161-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3237
| * \ \ \ \ \ \ Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-151-2/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3233
| * | | | | | | | FindBoost: Add support for MSVC toolset version 14.2Brad King2019-04-121-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the logic to express compatibility among 14.x versions.
* | | | | | | | | Merge topic 'findmpi-msvc-nolibdir'Brad King2019-04-301-12/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7db32efbab FindMPI: Don't retain libdirs for Win32 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3253
| * | | | | | | | | FindMPI: Don't retain libdirs for Win32Christian Pfeiffer2019-04-201-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows systems, the need to retain library directories should not nomrally occur. This can only occur on Unix like systems where a shared library is being linked that has a dependency on another library which is not being found in the default directories (e.g. libgfortran on BSD) This also works around an issue introduced by !1694 in that the Visual Studio generator does not handle link flags passed in `INTERFACE_LINK_LIBRARIES` correctly, causing problems when using that generator with Intel MPI in certain circumstances.
* | | | | | | | | | Merge topic 'msvc-c-features'Brad King2019-04-301-2/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eca275f63d CompileFeatures: Fix hard-coded MSVC C features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3247
| * | | | | | | | | CompileFeatures: Fix hard-coded MSVC C featuresBrad King2019-04-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8e4899fd6c (CompileFeatures: Record which C features the MSVC compiler supports, 2019-04-12) our `cmake_record_c_compile_features` macro was accidentally left not setting the `_result` variable, which had previously been set by `_record_compiler_features`. The variable is expected by the call site in `cmake_determine_compile_features` and used to switch between "failed" and "done" reports. Set it now. Also record `c_variadic_macros` only for cl 14 (VS 2005) and higher because it is not supported before that version.
* | | | | | | | | | Project: Report intel's simulation of gcc.R. Andrew Ohana2019-04-251-0/+14
| | | | | | | | | |
* | | | | | | | | | Merge topic 'update-documentation'Kyle Edwards2019-04-2453-167/+177
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb811d11ce Help: Improve description of modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3222
| * | | | | | | | | Help: Improve description of modulesBartosz Kosiorek2019-04-2353-167/+177
| | | | | | | | | |
* | | | | | | | | | Merge topic 'sunpro-cxx14-features'Brad King2019-04-222-0/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66f3f11af5 SunPro: Record support for C++14 features by SunPro 5.{14,15} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3248
| * | | | | | | | | | SunPro: Record support for C++14 features by SunPro 5.{14,15}Brad King2019-04-192-0/+13
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SunPro 5.15 supports `-std=c++14` and several C++14 features. SunPro 5.14 accepts `-std=c++14` but does not update its definition of `__cplusplus` or any other macro to distinguish it from `-std=c++11`, so we need to blacklist a couple features that do work but that we cannot report for that version. We can still support `cxx_std_14`. Co-Author: Robert Maynard <robert.maynard@kitware.com>
* | | | | | | | | | Merge topic 'msvc-warning-flags'Brad King2019-04-223-4/+33
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1baf122cd4 MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3250
| * | | | | | | | | | MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by defaultBrad King2019-04-193-4/+33
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not add default warning flags on other compilers, and having a warning flag in the default flags makes it hard for projects to customize the warning level. They need to use string processing to remove `/W3` from `CMAKE_{C,CXX}_FLAGS`. Therefore we should drop it. However, projects may be using string processing to replace `/W3` with another flag, so we cannot simply drop it. Add a policy to drop it in a compatible way. Fixes: #18317
* | | | | | | | | | Merge topic 'findqt3-hints-fix'Brad King2019-04-221-5/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | c298c4553b FindQt3: Restore missing lib and bin path suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3254
| * | | | | | | | FindQt3: Restore missing lib and bin path suffixesChristian Pfeiffer2019-04-221-5/+7
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules: Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2). Hints do not participate in the usual bin/lib subdirectory search that `<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit. Fixes: #19185
* | | | | | | | Merge topic 'add_xl_cxx14_support'Brad King2019-04-182-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 458ea9d76c XL: Add C++14 language level flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3235
| * | | | | | | | XL: Add C++14 language level flagsRobert Maynard2019-04-152-0/+9
| | | | | | | | |