summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'Tasking-regex-fix'Brad King2022-10-071-2/+2
|\ | | | | | | | | | | | | 5b03fecb8f Tasking: Simplify processor list matching regex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7752
| * Tasking: Simplify processor list matching regexHutchings Samuel (ETAS/ERS-PRM)2022-10-071-2/+2
| |
* | Merge topic 'ifw-4.4'Brad King2022-10-061-0/+1
|\ \ | |/ |/| | | | | | | | | e848ce21c9 CPack/IFW: Add support for QtIFW 4.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7750
| * CPack/IFW: Add support for QtIFW 4.4Erlend E. Aasland2022-10-051-0/+1
| | | | | | | | Fixes: #24027
* | Merge topic 'FindGDAL-debug-msvc'Brad King2022-10-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | fdc95c6d19 FindGDAL: Add library name for MSVC Debug GDAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7737
| * | FindGDAL: Add library name for MSVC Debug GDALGregoire Krähenbühl2022-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | Search for `gdald.lib`, which is how the library is now named when built with CMake under MSVC Debug. Fixes: #24015
* | | ExternalProject: Explicitly run Git commands on intended directoryPatrick Stewart2022-09-301-19/+19
|/ / | | | | | | | | | | | | Add `--git-dir=.git` to cause git commands to fail instantly if the `.git` folder has gone missing. Fixes: #24007
* | Merge topic 'traversaro-master-patch-54928'Brad King2022-09-291-1/+4
|\ \ | | | | | | | | | | | | | | | | | | e0a62b84b5 FindGLUT: On Windows and with multiple config generator do not use pkg-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7721
| * | FindGLUT: On Windows and with multiple config generator do not use pkg-configSilvio Traversaro2022-09-281-1/+4
| | |
* | | CMakeTestCXXCompiler.cmake: Improve logging consistencyMatthew Woehlke2022-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | Use "C++ compiler" rather than "CXX compiler" in certain logging messages. This improves both internal consistency (as "C++ compiler" was already used elsewhere) and consistency with e.g. the equivalent logging for the "Objective-C[++] compiler".
* | | Merge topic 'use-try_compile-source-from'Brad King2022-09-2828-157/+150
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 41f7b1169a Modules: Use new SOURCES_FROM_* try_compile (2/2) db76876db5 Modules: Use new SOURCES_FROM_* try_compile (1/2) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7717
| * | Modules: Use new SOURCES_FROM_* try_compile (2/2)Matthew Woehlke2022-09-279-79/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify some additional modules that ship with CMake to use the new SOURCES_FROM_* arguments to try_compile / try_run as added by commits cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and 611d801790 (try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers modules that need to read and alter a template source file, which were not addressed in the previous commit. Note that FindOpenACC.cmake does not actually need configure_file functionality; it appears to have inherited the (gratuitous) use thereof from FindOpenMP.cmake, with which its code bears significant similarity.
| * | Modules: Use new SOURCES_FROM_* try_compile (1/2)Matthew Woehlke2022-09-2719-78/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify some modules that ship with CMake to use the new SOURCES_FROM_* arguments to try_compile / try_run as added by commits cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and 611d801790 (try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers users which previously either used an existing file (but sometimes needed to rename it), or which wrote out their source in entirety. It does NOT cover users that actually need configure_file functionality, as those will be more involved to update and will thus be tackled in part 2.
* | | Merge topic 'remove-vs10-generator'Brad King2022-09-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8d6f015d59 Drop Visual Studio 10 2010 generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7718
| * | | Drop Visual Studio 10 2010 generatorBrad King2022-09-261-1/+1
| | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.22. Remove it.
* | | | Merge topic 'add_subdirectory_system'Brad King2022-09-271-2/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 2eb30a7036 add_subdirectory: Add SYSTEM option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7399
| * | | add_subdirectory: Add SYSTEM optionDa Quexian2022-09-261-2/+17
| | | | | | | | | | | | | | | | | | | | Fixes: #22401 Signed-off-by: Da Quexian <daquexian566@gmail.com>
* | | | Merge topic 'UseSWIG-macos-csharp-suffix'Brad King2022-09-261-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 6b14de6bc5 UseSWIG: Change the library suffix to 'dylib' for C# on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7659
| * | | UseSWIG: Change the library suffix to 'dylib' for C# on macOSMario Emmenlauer2022-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing on macOS, the command `swig_add_library("mytarget")` creates a library `libmytarget.so` instead of `libmytarget.dylib`. Subsequently, the library is not found by `dotnet` and the swig-generated `DllImport` statements. Fixes: #23967
* | | | Merge topic 'modernize-build-self'Brad King2022-09-231-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9629be8080 Build: Use `CMAKE_CURRENT_XXX_DIR` instead of top dirs e6fb5a1feb Build: Sort linked libraries list of `CMakeLib` aa7290e8dc Build: Use imported target `Threads::Threads` instead of variable df8ad72ffa Build: Use imported target `kwiml::kwiml` instead of variables eeebf31e54 Build: Use imported target `LibRHash::LibRHash` instead of variables 08be01a181 Build: Use imported target `LibUV::LibUV` instead of variables ddac6dcbe8 Build: Use imported target `JsonCpp::JsonCpp` instead of variables ac76c53d33 Build: Use imported target `CURL::libcurl` instead of variables ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7570
| * | | | Build: Use imported target `LibArchive::LibArchive` instead of variablesAlex Turbov2022-09-221-0/+3
| | | | |
* | | | | Merge topic 'cdo-consider-dots'Brad King2022-09-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df377a22dd CMakeDependentOption: allow in depends the use of . Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7701
| * | | | | CMakeDependentOption: allow in depends the use of .Vicente Adolfo Bolea Sanchez2022-09-211-1/+1
| |/ / / /
* | | | | Merge topic 'flang-windows'Brad King2022-09-231-0/+2
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | d34e5a98b8 LLVMFlang: Add support for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7692
| * | | LLVMFlang: Add support for Windowsمهدي شينون (Mehdi Chinoune)2022-09-211-0/+2
| | | |
* | | | Merge topic 'detect-lib_foo.a-msvc'Brad King2022-09-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be848a71b0 MSVC: Teach find_library to consider the 'libfoo.a' naming convention Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7694
| * | | | MSVC: Teach find_library to consider the 'libfoo.a' naming conventionYonggang Luo2022-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When targeting the GNU ABI, we consider `.a` libraries first but also accept `.lib`. For symmetry, when targeting the MSVC ABI, we now consider `.lib` first but also accept `.a`. This adds support for meson-generated static libraries, which are named with the pattern `lib${foo}.a`: * https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa Fixes: #23975 Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
* | | | | Merge topic 'use-new-project-try_compile'Brad King2022-09-195-16/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d00d8537f6 Modules: Use new keyword-dispatched try_compile signature Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7690
| * | | | | Modules: Use new keyword-dispatched try_compile signatureMatthew Woehlke2022-09-165-16/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Modify modules that ship with CMake and use the project flavor of try_compile to use the new signature added by commit 56ae40cc59 (try_compile: Add PROJECT keyword-dispatched signature, 2022-09-14).
* | | | | Merge topic 'android-clang-no-ndk-version'Brad King2022-09-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c86e397fe Android/Clang: Tolerate undefined CMAKE_ANDROID_NDK_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7689
| * | | | | Android/Clang: Tolerate undefined CMAKE_ANDROID_NDK_VERSIONBoris Egorov2022-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix for #21772, commit 005e2cdfb0 (Android: Do not use gold for ndk >= r22, 2021-02-26, v3.20.0-rc3~1^2), doesn't work with typical android toolchain file, like this one: https://android.googlesource.com/platform/ndk/+/master/build/cmake/android-legacy.toolchain.cmake The condition fails to work when CMAKE_ANDROID_NDK_VERSION is undefined: second part evaluates to true, although ndk version is not known. I've encountered following environment where CMAKE_ANDROID_NDK_VERSION is used without definition: * Build uses android toolchain file, which sets CMAKE_SYSTEM_VERSION=1 and doesn't set CMAKE_ANDROID_NDK_VERSION. * Code in Platform/Android-Determine.cmake exits early when it detects toolchain usage (via value CMAKE_SYSTEM_VERSION=1). This file is the only place in cmake modules where variable CMAKE_ANDROID_NDK_VERSION is set, and by early return we skip this definition.
* | | | | | Merge topic 'matlab-r2022b'Brad King2022-09-191-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | edbdfba3f5 FindMatlab: add R2022b 9.13 version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7683
| * | | | FindMatlab: add R2022b 9.13 version mapMichael Hirsch2022-09-161-0/+1
| | | | |
* | | | | FPHSA: Fix regression when VERSION_VAR is missingBrad King2022-09-151-9/+13
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a package is found but FPHSA is called by the find module without a `VERSION_VAR`, and the `find_package` call specifies a version, we have previously accepted the package as found. This was accidentally regressed by commit 8f50f135ae (FPHSA: Improve error message when VERSION_VAR is empty or has been unset(), 2022-08-01). Restore it and add a test case.
* | | | Merge topic 'add_tasking_compiler'Brad King2022-09-159-0/+225
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94df5b6ef1 Tasking: Add support for several compiler toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7491
| * | | | Tasking: Add support for several compiler toolsetsChristoph Seitz2022-09-149-0/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the Tasking compiler toolset: * TriCore Compiler Toolset 6.3 (with TriCore, ARM, MCS, 8051 and PCP architecture compilers) * SmartCode Compiler Toolset 10.1 (with TriCore, ARC, MCS, 8051 architecture compilers) * ARM Compiler 6.0 * MCS Complier 3.3 * 8051 Compiler 7.2 Fixes: #23756
* | | | | Merge topic 'binutils-apple-no-lld'Brad King2022-09-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a54e25b547 BinUtils: Avoid the 'ld.lld' ELF linker on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7671
| * | | | | BinUtils: Avoid the 'ld.lld' ELF linker on Apple platformsCarlo Cabrera2022-09-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | `ld.lld` is an ELF linker, so we should never set `CMAKE_LINKER` to this when targeting an Apple platform.
* | | | | Merge topic 'FindMatlab-macos-arm64'Brad King2022-09-151-1/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7673
| * | | | FindMatlab: Add MEX binary file suffix for Apple Silicon native MatlabMichael Hirsch2022-09-141-1/+5
| | | | | | | | | | | | | | | | | | | | The Matlab MEX binary file suffix is distinct for Apple Silicon.
| * | | | Merge topic 'fetchcontent-redirect-version-exact' into release-3.24Brad King2022-09-122-4/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48b380c961 FetchContent: Ignore EXACT for redirected find_package() calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7665
| * \ \ \ \ Merge topic 'FortranCInterface-LLVMFlang' into release-3.24Brad King2022-09-122-3/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f5b6dd215 FortranCInterface: Add support for LLVMFlang mangling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7658
* | \ \ \ \ \ Merge topic 'MsvcDebugInformationFormatAbstraction'Brad King2022-09-145-14/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a858466aac MSVC: Add test for debug information format 0e96a20478 MSVC: Add abstraction for debug information format d4c8111da4 Clang/Windows: Clarify name of internal runtime library flags variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7606
| * | | | | | | MSVC: Add abstraction for debug information formatGlen Chung2022-09-145-6/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace our hard-coded default for `/Zi` with a first-class abstraction to select the debug information format an enumeration of logical names. We've long hesitated to do this because the idea of "debug information format" touches on related concepts on several platforms. Avoid that scope creep by simply defining an abstraction that applies only when targeting the MSVC ABI on Windows. Removing the old default flag requires a policy because existing projects may rely on string processing to edit them and choose a runtime library under the old behavior. Add policy CMP0141 to provide compatibility. Fixes: #10189
| * | | | | | | Clang/Windows: Clarify name of internal runtime library flags variablesBrad King2022-09-131-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also avoid extra spaces in resulting flag strings.
* | | | | | | | Merge topic 'Windows-Intel-dependencies'Brad King2022-09-142-12/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90874a542e Intel classic compilers on Windows: use msvc style dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !7668
| * | | | | | | | Intel classic compilers on Windows: use msvc style dependenciesMarc Chevrier2022-09-132-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel classic compilers generate erroneous dependencies when gcc style is used with paths containing spaces. So, fall back to the old way to generate dependencies by using option /showIncludes. Fixes: #23948
* | | | | | | | | Merge topic 'modules-use-new-try_compile-signature'Brad King2022-09-1436-78/+66
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2edf0fc6d7 Modules: Use new keyword-dispatched try_compile signature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7656
| * | | | | | | | Modules: Use new keyword-dispatched try_compile signatureMatthew Woehlke2022-09-1436-78/+66
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify most of the modules that ship with CMake to use the new try_compile / try_run signatures added by commit aa9220d3a0 (try_compile: Add keyword-dispatched signature, 2022-09-02). This improves debugging by each invocation using its own directory so that the results of multiple invocations can be retained. This does not cover any invocations which provide an entire project, as that flavor of try_compile has not yet been updated.
* | | | | | | | Merge topic 'FindMPI-more-robust-conditionals'Brad King2022-09-131-70/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08dece8b18 FindMPI: remove unnecessary variable expansions in conditionals 1edc2f337f FindMPI: match full language names when "simplifying" 93b5bdb8b4 FindMPI: quote literal values Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7666