summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindDoxygen-win-glob'Brad King2018-11-271-7/+12
|\ | | | | | | | | | | | | 85a035bf00 FindDoxygen: Avoid Windows-specific GLOB on other platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2660
| * FindDoxygen: Avoid Windows-specific GLOB on other platformsNoel Eck2018-11-261-7/+12
| | | | | | | | | | | | | | | | | | | | When `$ENV{ProgramFiles}` is empty, GLOB takes `/Graphviz*/bin` as a path cusing the implementation to look at every directory in `/`. If the system has a slow(er) path mounted on '/' then `stat` call can take some time. There *may* be a better fix for this elsewhere, but for now simply do this GLOB only on Windows. Signed-off-by: Noel Eck <noel.eck@intel.com>
* | Merge topic 'ctest-updates'Brad King2018-11-271-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9195ab081 Tests: Teach run_ctest to handle removal of CTestConfig.cmake 1ca53f5ef1 Remove unnecessary CTEST_PROJECT_NAME variables 15ac4aae0e Remove warning when no CTestConfig.cmake file exists 3125c47d27 ctest_build: Do not require unnecessary [CTEST_]PROJECT_NAME value 36bbd07a76 CDashUpload: Use the query part of the submit url as field e1dfe8cee6 CTest: Don't require 'submit.php?' in submit location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2640
| * | Remove unnecessary CTEST_PROJECT_NAME variablesRegina Pfeifer2018-11-201-1/+0
| | |
* | | Merge topic 'blaslapack_mkl_gfortran'Brad King2018-11-272-119/+144
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c259912b14 FindBLAS: Do not look for BLAS once BLAS95 has been found d5f691be0b FindLAPACK: Additional libraries for MKL+gfortran combination 8b63265ea5 FindLAPACK: Unify internal variables related to MKL ede1715c1d FindLAPACK: Remove MKL components already provided by MKL BLAS 03879b11af FindLAPACK: Prioritize Intel MKL b4edf7b5d2 FindBLAS: Support 32bit Intel MKL 10.3+ fc149a72f7 FindBLAS: Support combination of gfortran and Intel MKL f0d52f55f1 FindBLAS: Consolidate duplicated code related to MKL on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2633
| * | | FindBLAS: Do not look for BLAS once BLAS95 has been foundJakub Benda2018-11-241-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | When BLA_F95 is ON, FindBLAS looks for BLAS95_LIBRARIES (in Intel MKL). As this is a superset of BLAS_LIBRARIES, if they are found, no further search in other vendors is necessary.
| * | | FindLAPACK: Additional libraries for MKL+gfortran combinationJakub Benda2018-11-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As per Intel MKL command line advisor, "libdl" is added to the list of libraries that provide LAPACK functionality. Furthermore, the implicit link directories are added to the searched libraries to allow finding of "libgomp".
| * | | FindLAPACK: Unify internal variables related to MKLJakub Benda2018-11-181-8/+10
| | | | | | | | | | | | | | | | | | | | Auxiliary internal variables related to MKL are now consistently prefixed with LAPACK_mkl_ and unset at the end of the MKL section.
| * | | FindLAPACK: Remove MKL components already provided by MKL BLASJakub Benda2018-11-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A surplus library libmkl_gf_... has been removed from the LAPACK libraries serach path (when relevant, it is already provided by BLAS). Similarly, the thread libraries do not need to be explicitly added to the implicit LAPACK libraries, as they are already included in the list (via BLAS libraries provided by FindBLAS).
| * | | FindLAPACK: Prioritize Intel MKLJakub Benda2018-11-181-75/+77
| | | | | | | | | | | | | | | | | | | | | | | | As in FindBLAS, the Intel Math Kernel Library is now the preferred LAPACK vendor. (The corresponding section of the code has been moved upwards.)
| * | | FindBLAS: Support 32bit Intel MKL 10.3+Jakub Benda2018-11-181-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | The module FindBLAS now correctly finds Intel MKL distributions that do not have the (long deprecated) library "libguide", but use "libiomp5" instead.
| * | | FindBLAS: Support combination of gfortran and Intel MKLJakub Benda2018-11-181-24/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module FindBLAS now correctly chooses MKL BLAS libraries to search, based on the compiler ID. The MKL libraries needed for BLAS functionality are the following: libmkl_{gf|intel}_{lp64|ilp64}.{a|so} libmkl_{gnu|intel}_thread.{a|so} (or libmkl_sequential.{a|so}) libmkl_core.{a|so} libm libdl lib{gomp|iomp5}.{a|so} (only with libmkl_*_thread.*) To achieve the goal, the following internal variables are defined and used: BLAS_mkl_INTFACE = "gf" or "intel" (based on compiler ID) BLAS_mkl_THREADING = "gnu" or "intel" (based on compiler ID) BLAS_mkl_OMP = "gomp" or "iomp5" (based on compiler ID) BLAS_mkl_LM = "-lm" (not set on Windows) BLAS_mkl_DL = "-ldl" (not set on Windows) The default values for the first three of them are "intel" and "iomp5", unless a Fortran compiler is loaded with CMAKE_Fortran_COMPILER_ID equal to "GNU"; in such case the "gf", "gnu" and "gomp" values are used. In non-Windows systems, the thread library as well as libm and libdl are now added to the linker line to allow static linking of libgomp.
| * | | FindBLAS: Consolidate duplicated code related to MKL on WindowsJakub Benda2018-11-181-12/+7
| | | | | | | | | | | | | | | | | | | | The code that decides which library suffix to use for MKL libraries in Windows was in two places. This commit consolidates it in one place.
* | | | Merge topic 'FindBoost-no-cxx'Brad King2018-11-271-6/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 0369362132 FindBoost: Restore finding without CXX language enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2663
| * | | FindBoost: Restore finding without CXX language enabledBrad King2018-11-261-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.13.0~7^2 (FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+, 2018-11-07) we run the internal `_Boost_COMPILER_DUMPVERSION` macro on all UNIX platforms. Teach the macro to tolerate missing `CMAKE_CXX_COMPILER_VERSION`, which occurs when the CXX language is not enabled. Fixes: #18624
| * | | Merge branch 'blas-pkgcfg' into release-3.13Brad King2018-11-191-0/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2631
| * \ \ \ Merge branch 'FindPython-lib-arch' into release-3.13Brad King2018-11-191-0/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2624
| * \ \ \ \ Merge branch 'irsl-ucrt-version' into release-3.13Brad King2018-11-191-3/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2637
| * \ \ \ \ \ Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-11-131-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2601
| * \ \ \ \ \ \ Merge branch 'FindBoost-compiler-guess-update' into release-3.13Brad King2018-11-091-7/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2579
| * \ \ \ \ \ \ \ Merge branch 'asm-compiler-id-clang' into release-3.13Brad King2018-11-091-0/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2584
* | \ \ \ \ \ \ \ \ Merge topic 'FindGIF-modernize'Brad King2018-11-211-13/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74cc42e937 Help: Add notes for topic 'FindGIF-modernize' 6962a41e6b FindGIF: Add test 5bc64fe6c2 FindGIF: Modernize Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2632
| * | | | | | | | | | FindGIF: ModernizeMaximilian Heinzler2018-11-201-13/+47
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the module up to the current find module standards by adding the GIF_INCLUDE_DIRS variable and the target GIF::GIF. It also updates the documentation style to that of similar modules.
* | | | | | | | | | Merge topic 'find-boost-test-version'Brad King2018-11-211-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19d92d5e6e FindBoost: provide the version in x.y.z format 186f69cf26 FindBoost: test version variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2638
| * | | | | | | | | FindBoost: provide the version in x.y.z formatBen Boeckel2018-11-201-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge topic 'blas-pkgcfg'Brad King2018-11-201-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c31effed FindBLAS: Restore BLAS_FOUND when found using pkgconfig Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2631
| * | | | | | | | | FindBLAS: Restore BLAS_FOUND when found using pkgconfigMartin von Gagern2018-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~92^2 (FindPkgConfig: export the list of found libraries also as variable, 2018-05-11) dropped use of FPHSA to set `BLAS_FOUND`. Set it explicitly instead.
* | | | | | | | | | Merge topic 'FindPython-lib-arch'Brad King2018-11-201-0/+17
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c24f29c664 FindPython: Ensure config tool matches library architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Eric Noulard <eric.noulard@gmail.com> Merge-request: !2624
| * | | | | | | | | FindPython: Ensure config tool matches library architectureMarc Chevrier2018-11-191-0/+17
| |/ / / / / / / /
* | | | | | | | | Merge topic 'irsl-ucrt-version'Brad King2018-11-201-3/+19
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 01c7d9ce86 IRSL: Detect versioned Windows Universal CRT directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2637
| * | | | | | | IRSL: Detect versioned Windows Universal CRT directoriesBrad King2018-11-191-3/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows SDK version 10.0.17763.0 now places the uCRT libraries in a versioned directory. Fixes: #18603
* | | | | | | Merge topic 'findx11-imported-targets'Brad King2018-11-191-121/+347
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bced9d5e56 Tests/FindX11: add a test a7d2ffb232 FindX11: add imported targets 40b3dba529 FindX11: require Freetype and Fontconfig for Xft cc96249e2e FindX11: remove local variable from the advanced list 99489d9f10 FindX11: find Xext.h b8b598061a FindX11: match variables with library names 6079a0d00f FindX11: fix some formatting in the documentation 3c54955d0d FindX11: use `list(APPEND)` for clearer code ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2604
| * | | | | | FindX11: add imported targetsBen Boeckel2018-11-131-36/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These imported targets are fine-grained and recommended over the global `X11_LIBRARIES` and `X11_INCLUDE_DIR` variables.
| * | | | | | FindX11: require Freetype and Fontconfig for XftBen Boeckel2018-11-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xft header includes headers from freetype and fontconfig, so they are necessary for its use.
| * | | | | | FindX11: remove local variable from the advanced listBen Boeckel2018-11-121-1/+0
| | | | | | |
| * | | | | | FindX11: find Xext.hBen Boeckel2018-11-121-1/+3
| | | | | | |
| * | | | | | FindX11: match variables with library namesBen Boeckel2018-11-121-41/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecates various variables, but provides them for backwards compatibility.
| * | | | | | FindX11: fix some formatting in the documentationBen Boeckel2018-11-121-2/+2
| | | | | | |
| * | | | | | FindX11: use `list(APPEND)` for clearer codeBen Boeckel2018-11-121-39/+39
| | | | | | |
| * | | | | | FindX11: use lowercase function namesBen Boeckel2018-11-121-14/+14
| | | | | | |
* | | | | | | Merge topic 'cpack'Brad King2018-11-151-9/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a26ac919ef Help: Explain interaction of cpack(1) and CPack. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2617
| * | | | | | | Help: Explain interaction of cpack(1) and CPack.Joachim Wuttke (l)2018-11-151-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, make clear that package/installer generators are not the makefile generators of the cmake command. Also insert sections in CPack doc, and capitalize section titles.
* | | | | | | | Merge topic 'deprecate-findqt'Brad King2018-11-151-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f5c1b404b find_package(): Add policy to remove the FindQt module Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: noo mook <noomook2519@gmail.com> Merge-request: !2554
| * | | | | | | find_package(): Add policy to remove the FindQt moduleKyle Edwards2018-11-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing FindQt.cmake gives Qt upstream a path forward to export its own QtConfig.cmake files which can be found by find_package() without having to explicitly specify CONFIG. Projects that still want to use Qt3/4 can call find_package(Qt[34]), include(FindQt), or add FindQt.cmake to their CMAKE_MODULE_PATH.
* | | | | | | | Merge topic 'GNUInstallDirs-FreeBSD-info'Brad King2018-11-141-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f835f189ae GNUInstallDirs: Update FreeBSD "info" destination to share/info 4c0d97dd98 GNUInstallDirs: Split "info" and "man" default logic 1b8f0ca515 Tests: Split GNUInstallDirs expectations for FreeBSD Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !2588
| * | | | | | | | GNUInstallDirs: Update FreeBSD "info" destination to share/infoTobias C. Berner2018-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeBSD ports commit r484628 (Install texinfo files (GNU info) into ${PREFIX}/share/info, 2018-11-10) changed the "info" destination from "info" to "share/info". The commit included a patch to their distribution of CMake to fix the `GNUInstallDirs` module too. Apply a similar logic change to our upstream version of the module. We already made a similar change for GNU/kFreeBSD in commit v3.13.0-rc2~8^2 (GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD, 2018-10-21). Fixes: #18585
| * | | | | | | | GNUInstallDirs: Split "info" and "man" default logicBrad King2018-11-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conditions may soon differ.
* | | | | | | | | Merge topic 'SelectLibraryConfigurations'Brad King2018-11-131-16/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe15a1029c Help: Revise documentation of SelectLibraryConfigurations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2608
| * | | | | | | | | Help: Revise documentation of SelectLibraryConfigurationsJoachim Wuttke (l)2018-11-131-16/+24
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List format for chosen variables. New paragraph before description of special cases.
* | | | | | | | | Merge topic 'DeployQt4'Brad King2018-11-131-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7f02197b Help: Downcase function names in DeployQt4 doc. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2600