summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindMPI-restore-flags-string'Brad King2018-09-111-1/+1
|\ | | | | | | | | | | | | | | | | e374b9f1eb FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line string Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Christoph Junghans <junghans@votca.org> Reviewed-by: Christian Pfeiffer <cpfeiffer@live.de> Merge-request: !2368
| * FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line stringBrad King2018-09-101-1/+1
| | | | | | | | | | | | | | | | | | Refactoring in commit v3.10.0-rc1~103^2~2 (FindMPI: Modernization from ground up, 2017-04-25) accidentally left this variable set as a copy of the `;`-list in `MPI_<LANG>_COMPILE_OPTIONS`, but the flags variable is documented as a command-line string. Restore it now. Fixes: #18349
| * Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12Brad King2018-09-051-15/+0
| |\ | | | | | | | | | Merge-request: !2354
| * \ Merge branch 'FindBoost-old-context' into release-3.12Brad King2018-09-041-1/+5
| |\ \ | | | | | | | | | | | | Merge-request: !2348
| * \ \ Merge branch 'CheckIPOSupported-output-backslashes' into release-3.12Brad King2018-08-301-4/+11
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2331
| * \ \ \ Merge branch 'android-ndk-r18' into release-3.12Brad King2018-08-282-2/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2319
| * \ \ \ \ Merge branch 'FindCUDA-deprecate-cublas_device' into release-3.12Brad King2018-08-231-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2298
* | \ \ \ \ \ Merge topic 'FindOpenSceneGraph-debug'Brad King2018-09-102-21/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 192e552099 FindOpenSceneGraph: Fix find in Debug Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2341
| * | | | | | | FindOpenSceneGraph: Fix find in DebugCyril Boucher2018-09-062-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of now, it is not possible to find OpenSceneGraph in Debug because the only variable find_package_handle_standard_args is checking is ${module}_LIBRARY while the debug library is in ${module}_LIBRARY_DEBUG. The refactoring gets rid of the old behaviour to replace with a call to select_library_configurations which will populated ${module}_LIBRARY accordingly. [Modules/Findosg_functions.cmake Modules/FindOpenThreads.cmake] - Include SelectLibraryConfigurations module - Modify the name of the variable that will be populated by the first find_library to ${MODULE}_LIBRARY_RELEASE so that SelectLibraryConfigurations can act on it - Add call to select_library_configurations after attempting to find libraries in debug and release
* | | | | | | | Merge topic 'FindSubversion-wc-info-error'Brad King2018-09-101-12/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68d015fc94 FindSubversion: Add Subversion_WC_INFO option to suppress failures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2292
| * | | | | | | | FindSubversion: Add Subversion_WC_INFO option to suppress failuresJason Heeris2018-09-071-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subversion fails when the directory is not actually under its control. Allow projects to tolerate this case optionally. Fixes: #18264
* | | | | | | | | Merge topic 'extra-generator-split-arg1'Brad King2018-09-101-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0239b586bd Extra Generator: Fix handling of CMAKE_<LANG>_COMPILER_ARG1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2352
| * | | | | | | | | Extra Generator: Fix handling of CMAKE_<LANG>_COMPILER_ARG1Adam Oleksy2018-09-071-0/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "arg1" value is a command-line string so we must parse it to get separate arguments for `execute_process`.
* | | | | | | | | Merge topic 'ExternalProject-check-explicit-include'Craig Scott2018-09-071-0/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df1ddeec12 ExternalProject: Report error if local variables are not defined Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !2281
| * | | | | | | | ExternalProject: Report error if local variables are not definedJean-Christophe Fillion-Robin2018-09-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since in some situations, ExternalProject module may be included in a sub-directory, functions will be available in the global scope but local variables like "_ep_keywords_<keyword>" will not be defined, this commit checks and reports an error indicating that the ExternalProject module must be explicitly included before using any of the ExternalProject_* functions that require the module's inclusion within the current scope or above. Co-authored-by: Pablo Hernandez <pablo.hernandez@kitware.com> Co-authored-by: Craig Scott <craig.scott@crascit.com>
* | | | | | | | | Merge topic 'CMakeFindBinUtils-fix-not-cached'Brad King2018-09-061-3/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53bae4cc5e CMakeFindBinUtils: Fix use with non-cached tool settings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2355
| * | | | | | | | | CMakeFindBinUtils: Fix use with non-cached tool settingsBrad King2018-09-051-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project or toolchain file hard-codes a tool location such as `CMAKE_LINKER` with a plain `set()` then the value will be stored in compiler information files but not cached. If the value is not cached then we should not mark it as advanced because doing so will initialize an empty cache entry. Fixes: #18315
* | | | | | | | | | Merge topic 'FindMatlab-no-CMAKE_CL_64'Brad King2018-09-061-15/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | bfe883af60 FindMatlab: Remove erroneous duplicate code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2354
| * | | | | | | | FindMatlab: Remove erroneous duplicate codeRaffi Enficiaud2018-09-051-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was left accidentally when resolving merge conflicts between previous changes. Fixes: #18221
* | | | | | | | | Merge topic 'FindBoost-old-context'Brad King2018-09-051-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 9a800c12fc FindBoost: Fix context discovery for 1.60 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2348
| * | | | | | | FindBoost: Fix context discovery for 1.60 and belowIgor Kostenko2018-09-041-1/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `all.hpp` was removed in 1.68: https://github.com/boostorg/context/commit/2e37599461912cc1679f106a25456a493f7f0b27 * `fcontext.hpp` was moved to detail in 1.61: https://github.com/boostorg/context/commit/c2f0dfdf2608c1ebaa2229fa6f358fe6aa103561 Fixes: #18126
* | | | | | | Merge topic 'FindBLAS-implicit-blas-final'Brad King2018-08-311-498/+526
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cdff15ef7 FindBLAS: Make Intel MKL the most preferred explicit BLAS library again 608de88f29 FindBLAS: Make Intel MKL code block respect prior found BLAS libraries 5b8f69ebe9 FindBLAS: Detect implicitly linked BLAS library 2c807b75f3 FindBLAS: Re-indent module source code to use normal conventions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2312
| * | | | | | | FindBLAS: Make Intel MKL the most preferred explicit BLAS library againHubertus van Dam2018-08-301-180/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding the "if (NOT BLAS_LIBRARIES)" statement to the Intel MKL detection code block we have unintentionally turned Intel MKL from the most preferred into the least preferred BLAS library. To fix this issue the Intel MKL detection code block needs to be moved forward to make it the first explicit BLAS library we test for. This is change does just that and re-instates Intel MKL as the most preferred explicit BLAS library.
| * | | | | | | FindBLAS: Make Intel MKL code block respect prior found BLAS librariesHubertus van Dam2018-08-301-155/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All non-Intel BLAS library detection blocks have an if-statement "if (NOT BLAS_LIBRARIES)" to ensure that if a BLAS library was found we are not going to try and find another one. This causes a problem when we have already found that we do not need to specify a BLAS library, as the Intel MKL library takes precedence over everything. Introducing the "if (NOT BLAS_LIBRARIES)" if-statement fixes this problem.
| * | | | | | | FindBLAS: Detect implicitly linked BLAS libraryHubertus van Dam2018-08-301-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the Check_Fortran_Libraries macro with an *empty* list of libraries to detect whether the compiler implicitly links BLAS. If this works, set `BLAS_LIBRARIES` to a placeholder value to get through the rest of our logic. At the end replace the placeholder by a real empty string again to report to callers.
| * | | | | | | FindBLAS: Re-indent module source code to use normal conventionsKitware Robot2018-08-301-476/+476
| | | | | | | |
* | | | | | | | Merge topic 'CheckIPOSupported-output-backslashes'Brad King2018-08-311-4/+11
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e1ea02bb8 CheckIPOSupported: Tolerate backslashes in output of failed checks b7dbb25a0a CheckIPOSupported: Simplify result reporting logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2331
| * | | | | | | CheckIPOSupported: Tolerate backslashes in output of failed checksBrad King2018-08-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid passing the output of our `try_compile` through a macro argument. Macro invocations re-parse their arguments and so should not be given arbitrary content that may contain backslashes and such. Instead pass a simple message. This is also more readable in the case that the macro generates a message itself. After the macro returns, report the real output directly to the variable named by our caller. Also record the output in a log file as other checks do on failure. Fixes: #18244
| * | | | | | | CheckIPOSupported: Simplify result reporting logicBrad King2018-08-301-3/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the test for whether a `RESULT` argument was given to the `check_ipo_supported` call. Also do not set an empty variable name if `OUTPUT` was not given.
* | | | | | | Merge topic 'cmake_lang_compiler_predefines'Brad King2018-08-303-3/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83f2d48388 Respect CMAKE_<LANG>_COMPILER_ARG1 in CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2316
| * | | | | | | Respect CMAKE_<LANG>_COMPILER_ARG1 in CMAKE_<LANG>_COMPILER_PREDEFINES_COMMANDSebastian Holtermann2018-08-283-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUTOMOC used to fail to generate ``moc_predefs.h`` when ``ccache`` was used as a compiler starter by e.g. configuring a project with the environment variable CXX="ccache g++". The reason was that ``CMAKE_<LANG>_COMPILER_ARG1`` wasn't respected in the definition of ``CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`` for various compilers. This is fixed by this patch. Fixes #17275.
* | | | | | | | Merge topic 'remove-lua-extra-paths'Brad King2018-08-301-9/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bd71f6377 FindLua: Remove manually specified additional paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !2321
| * | | | | | | | FindLua: Remove manually specified additional pathsChuck Atkins2018-08-281-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The additional paths specified are already accounted for in the appropriate Platform files.
* | | | | | | | | Merge topic 'android-ndk-r18'Brad King2018-08-302-2/+15
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca97d4cb5f Android: Add support for NDK r18 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2319
| * | | | | | | | Android: Add support for NDK r18Brad King2018-08-282-2/+15
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NDK r18 drops GCC toolchains and some STL types. We need to choose a clang toolchain by default when no gcc toolchains are available. Switch the STL type default to `c++_static` when the old `gnustl_static` default is not available. Update the test suite to not run tests for STL types that do not exist. Also do not expect the gcc toolchain `cpp` tool to be available because r18 does not provide it. Also teach it to tolerate `gcc -dumpmachine` output like `arm--linux-android` that differs from the toolchain prefix. Fixes: #18301
* | | | | | | | FindMatlab: Guard against nonexistent installationChuck Atkins2018-08-271-12/+14
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'cray_cce_cxx14'Brad King2018-08-271-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a655681c3 Cray: Record C++14 compiler mode options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2307
| * | | | | | | Cray: Record C++14 compiler mode optionsKelly (KT) Thompson2018-08-241-0/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #18270
* | | | | | | Merge topic 'FindZLIB-ProgramFiles'Brad King2018-08-271-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbbc6e2eef FindZLIB: Fix path detection via ProgramFiles env variables Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: RElesgoe <relesgoe@gmail.com> Merge-request: !2287
| * | | | | | | FindZLIB: Fix path detection via ProgramFiles env variablesAndreas Schneider2018-08-241-3/+5
| |/ / / / / /
* | | | | | | Merge topic 'xcode-compiler-id-sign-identity'Brad King2018-08-272-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c68b358ce3 Xcode: Set CODE_SIGN_IDENTITY during compiler identification Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Gregor Jasny <gjasny@googlemail.com> Merge-request: !2299
| * | | | | | | Xcode: Set CODE_SIGN_IDENTITY during compiler identificationRafal Parzych2018-08-242-0/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY` is set then propagate it to the compiler id test project too. Fixes: #18292
* | | | | | | Merge topic 'extra-gen-fix-0'Brad King2018-08-271-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4e6b63ec9 Extra Generator: Fix extraction of macros with value 0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2308
| * | | | | | Extra Generator: Fix extraction of macros with value 0ibisz2018-08-241-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fix logic in CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs to handle macros with value `0`.
* | | | | | Merge topic 'FindCUDA-deprecate-cublas_device'Brad King2018-08-241-1/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bdf1f36135 FindCUDA: Do not find cublas_device on CUDA >= 9.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2298
| * | | | | FindCUDA: Do not find cublas_device on CUDA >= 9.2Kenta Kubo2018-08-231-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cublas_device` has been deprecated and will be removed in future versions of CUDA. Issue: #18290
* | | | | Merge topic 'cuda-no-cublas_device'Brad King2018-08-242-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | 122c79748c CUDA: Avoid using deprecated cublas_device to identify device lib dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2296
| * | | CUDA: Avoid using deprecated cublas_device to identify device lib dirsRobert Maynard2018-08-232-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Use `curand_static` to identify directories containing device libraries because `cublas_device` is deprecated and will be removed in the future. Issue: #18290
| * | Merge branch 'cuda-arch-version' into release-3.12Brad King2018-08-011-2/+3
| |\ \ | | | | | | | | | | | | Merge-request: !2251
* | | | doc: Consistently use <PackageName> for describing the name of a packageJean-Christophe Fillion-Robin2018-08-143-9/+9
| |_|/ |/| |
generated by cgit v0.12 at 2025-01-29 15:04:46 (GMT)