summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Implement MSVC runtime library abstractionBrad King2019-06-261-4/+19
| | | | | | | | | In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked updating flags for CUDA on Windows, where nvcc uses MSVC as the host compiler. Add them now and update the MSVCRuntimeLibrary test to cover CUDA. Fixes: #19428
* Merge branch 'android-pie-cmp0083' into release-3.15Brad King2019-06-191-0/+20
|\ | | | | | | Merge-request: !3459
| * Android: ensure PIE behavior is consistent regardless CMP0083 policyMarc Chevrier2019-06-191-0/+20
| | | | | | | | | | | | | | | | | | In commit c4b4d8b3a6 (POSITION_INDEPENDENT_CODE: Manage link flags for executables, 2018-10-02, v3.14.0-rc1~395^2) we accidentally removed our Android-specific logic for PIE under the CMP0083 OLD behavior. Restore it and also implement Android-specific logic for CMP0083 NEW behavior. Fixes: #19393
| * Merge branch 'FindThreads-doc-c++' into release-3.14Brad King2019-05-281-3/+0
| |\ | | | | | | | | | Merge-request: !3391
* | \ Merge branch 'FindMPI-imported-link-flags' into release-3.15Brad King2019-06-191-1/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !3449
| * | | FindMPI: Store imported target link flags as a list instead of a stringRobert Maynard2019-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already use the `separate_arguments` `NATIVE_COMMAND` mode to parse command-line strings into lists in several other places. Fixes: #18897
* | | | Merge branch 'FindBoost-component' into release-3.15Brad King2019-06-181-5/+157
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3438
| * | | | FindBoost: Add legacy variables and targets for compatibilityAlexander Grund2019-06-181-0/+150
| | | | | | | | | | | | | | | | | | | | | | | | | This allows future BoostConfig to NOT define those and users relying on them use the newer FindBoost of newer CMake versions
| * | | | FindBoost: Don't overwrite Boost_${_comp}_FOUNDAlexander Grund2019-06-181-5/+7
| |/ / / | | | | | | | | | | | | Is set in Boost >= 1.71 so don't overwrite it
* | | | Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15Brad King2019-06-171-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3434
| * | | | FindBLAS: Add second try for OpenBLAS with thread libraries.Alexander Neumann2019-06-171-1/+15
| |/ / / | | | | | | | | | | | | Issue: #16221
* | | | Merge branch 'CheckCXXSymbolExists-xref' into release-3.15Brad King2019-06-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3437
| * | | | CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C versionRolf Eike Beer2019-06-121-1/+1
| |/ / /
* | | | Merge branch 'cpack-nuget-case' into release-3.15Brad King2019-06-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3427
| * | | | CPack/NuGet: Find nuget tool on case sensitive file systemMathieu Malaterre2019-06-051-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | There is no need to use a CamelCase executable name since it will be handled gracefully on Windows anyway. This change allow support for Linux system, in particular Debian distribution where the binary is called `nuget`.
* | | | Help: Trivial typo and grammar fixes for FindEnvModulesCraig Scott2019-06-051-3/+3
|/ / /
* | | GetPrerequisites: fix regression in gp_append_uniqueBen Boeckel2019-06-041-1/+1
| | | | | | | | | | | | | | | | | | The `item` variable was the loop variable in the old code prior to commit 3dfc8b9bd6 (GetPrerequisites: use if(IN_LIST) instead of foreach, 2019-05-09). The function argument `value` should be used instead.
* | | Merge topic 'ninja-nvcc-rsp'Brad King2019-06-041-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d91b5a72cd Ninja: Add support for CUDA nvcc response files 5efac09bed Ninja: Compute linker response file flag earlier Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3399
| * | | Ninja: Add support for CUDA nvcc response filesFrancisco Facioni2019-06-031-0/+5
| | | |
* | | | Merge topic 'check_language_respects_cuda_host_compiler'Brad King2019-06-041-4/+23
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | fada8cbfd6 CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3407
| * | | CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilationRobert Maynard2019-06-031-4/+23
| | | | | | | | | | | | | | | | Fixes: #19013
* | | | FindPython: ensure Python_ROOT_DIR is always searched firstMarc Chevrier2019-05-311-0/+2
| | | |
* | | | Merge topic 'ninja-cmcldeps'Brad King2019-05-311-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3404
| * | | | Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RCMarc-André Moreau2019-05-301-1/+3
| | | | |
* | | | | Merge topic 'FindPython-remove-erroneous-code'Brad King2019-05-311-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4a871d51a3 FindPython*: remove erroneous code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3400
| * | | | FindPython*: remove erroneous codeMarc Chevrier2019-05-301-2/+0
| | | | |
* | | | | Merge topic 'FindBoost-debug-messages'Brad King2019-05-301-100/+100
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 35bfc85d95 FindBoost: Refactor debug messages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3382
| * | | | FindBoost: Refactor debug messagesDennis Klein2019-05-281-100/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Deduplicate code with helper functions * Remove double printing of _boost_TEST_VERSIONS * Fix #19158 * Add printing of a few additional variables
* | | | | Merge topic 'clang-gnulike-support'Brad King2019-05-298-50/+169
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74829f01b1 Help: Add notes for topic 'clang-gnulike-support' 19669abe1d Tests: handle string escaping differences with NMake+clang a2a90f41e3 Tests: require C++14 for the Tutorial 4819ff9647 Tests: fix failures with gnu mode clang on windows 26af0b25e7 cmake: use correct stack size with gnu mode clang on windows d44c0db0b2 clang: setup correct configuration in gnu mode b7d5ef23e9 cmGlobalNinjaGenerator: use gnu compatible paths with clang in gnu mode 3d0210d8dc binutils: add the llvm-* variants to the tool lists. ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Francesco Bertolaccini <francesco@bertolaccini.dev> Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com> Acked-by: Saleem Abdulrasool <compnerd@compnerd.org> Merge-request: !2992
| * | | | | clang: setup correct configuration in gnu modeZsolt Parragi2019-05-232-7/+123
| | | | | |
| * | | | | binutils: add the llvm-* variants to the tool lists.Zsolt Parragi2019-05-171-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows cmake to use the ar/ranlib/objdump/ld tools on windows without mingw installed. These tools are selected when clang is in GNU command line mode.
| * | | | | clang: introduce CMAKE_<lang>_COMPILER_FRONTEND_VARIANTZsolt Parragi2019-05-175-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable is set to GNU on Windows when clang.exe ar clang++.exe is used, and set to MSVC for clang-cl.exe. CMAKE_<lang>_SIMULATE_ID is set to MSVC in both cases, as clang defaults to -fms-compatibility for all command lines on windows.
* | | | | | Merge topic 'FindZLIB-names'Brad King2019-05-291-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ff3ab2ac9 FindZLIB: Add more zlib library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3384
| * | | | | | FindZLIB: Add more zlib library namesAlexander Neumann2019-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account for all names that can be generated by the upstream zlib build system. Issue: #18029
* | | | | | | Merge topic 'samu'Brad King2019-05-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3380
| * | | | | | | Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAMMichael Forney2019-05-281-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `samurai` is an alternative implementation of ninja and is a drop-in replacement. `samu --version` reports the ninja version it is compatible with.
* | | | | | | Merge topic 'swift-wrapper'Brad King2019-05-291-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6baa80d1e3 Modules: correct linker wrapper flag for Swift Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3390
| * | | | | | | Modules: correct linker wrapper flag for SwiftSaleem Abdulrasool2019-05-281-1/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This was sitting locally but was missed in previous commits. This enables the use of `LINKER:` when building Swift code bases.
* | | | | | | Merge topic 'linker-preference'Brad King2019-05-291-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abea06efdf Modules: setup `CMAKE_Swift_LINKER_PREFERENCE` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3373
| * | | | | | | Modules: setup `CMAKE_Swift_LINKER_PREFERENCE`Saleem Abdulrasool2019-05-241-0/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift's driver will invoke the C++ driver (`clang++`) to invoke the linker. Additionally, it will configure the command line to deal with the linkage runtime support object (`swiftrt.o` or `swiftrt.obj`) to be added at the right time (similar to C/C++). Since it indirects through `clang++` it will properly setup the linker invocation for C++ and C as well. This should permit the correct linker driver to be invoked in multi-language projects. Closes #19299
* | | | | | | Merge topic 'findopenmp-new-dates'Brad King2019-05-291-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3375
| * | | | | | | FindOpenMP: Add 5.0 and VS19 spec datesChristian Pfeiffer2019-05-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19289
* | | | | | | | Merge topic 'flex'Brad King2019-05-281-0/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7754448f6 FindFLEX: fix example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3379
| * | | | | | | FindFLEX: fix exampleMarcin Ślusarz2019-05-261-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Binaries using flex must link with the detected library.
* | | | | | | Merge topic 'FindThreads-doc-c++'Brad King2019-05-281-3/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a38b63c1bb FindThreads: Drop incorrect docs about usage with C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3391
| * | | | | | FindThreads: Drop incorrect docs about usage with C++Brad King2019-05-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the sentence added by commit 5a5a1d90f0 (Help: FindThreads not needed with modern C++., 2019-01-09, v3.14.0-rc1~186^2) about not needing the module with modern C++. The module is often still needed. Fixes: #19297
* | | | | | | Merge topic 'FindPython-find_framework'Brad King2019-05-284-15/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62d6ed79fb FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks lookup. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3374
| * | | | | | | FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks lookup.Marc Chevrier2019-05-244-15/+41
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'GetPrerequisites-use-if-IN_LIST'Brad King2019-05-281-10/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dfc8b9bd6 GetPrerequisites: use if(IN_LIST) instead of foreach Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3299
| * | | | | | | GetPrerequisites: use if(IN_LIST) instead of foreachBen Boeckel2019-05-231-10/+6
| | | | | | | |