summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* CMake Nightly Date StampKitware Robot2018-11-181-1/+1
|
* CMake Nightly Date StampKitware Robot2018-11-171-1/+1
|
* CMake Nightly Date StampKitware Robot2018-11-161-1/+1
|
* Merge topic 'cpack'Brad King2018-11-152-23/+44
|\ | | | | | | | | | | | | 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-152-23/+44
| | | | | | | | | | | | | | 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 'test-WriteBasicConfigVersionFile'Brad King2018-11-155-906/+891
|\ \ | | | | | | | | | | | | | | | | | | | | | f3a381115f Tests: Simplify RunCMake.WriteBasicConfigVersionFile 0dbcc1afbf Tests: Factor out RunCMake.WriteBasicConfigVersionFile test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2612
| * | Tests: Simplify RunCMake.WriteBasicConfigVersionFileBrad King2018-11-142-29/+8
| | |
| * | Tests: Factor out RunCMake.WriteBasicConfigVersionFile testBrad King2018-11-146-906/+912
| | | | | | | | | | | | | | | The `WriteBasicConfigVersionFile` section of the `FindPackageTest` is independent of the rest.
* | | Merge topic 'configure_file-canonical-deps'Brad King2018-11-155-11/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6199637e95 configure_file: canonicalize input and output path in dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2586
| * | | configure_file: canonicalize input and output path in dependenciesFrank Benkstein2018-11-135-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent the input file path internally in canonical form. Otherwise multiple `configure_file` calls that share the same input file but specify it relative to different directories (e.g. via `../`) result in multiple copies of the dependency on the rule to re-run CMake. This causes the Ninja generator to emit duplicate phony build statements for these dependencies, which generates an error with `-w dupbuild=err`, which will be default in Ninja 1.9. Also canonicalize the output path for consistency. Add a test case. Fixes: #18584
* | | | Merge topic 'deprecate-findqt'Brad King2018-11-1516-5/+141
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1416-5/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'autogen_info_write'Brad King2018-11-157-184/+271
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0c26406aa Autogen: Sort tests 83bbfb1d53 Autogen: Add a definitions test to the MocOnly test 01d5e5c460 Autogen: Add and use cmQtAutoGenInitializer::InfoWriter class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2610
| * | | | | Autogen: Sort testsSebastian Holtermann2018-11-143-38/+32
| | | | | |
| * | | | | Autogen: Add a definitions test to the MocOnly testSebastian Holtermann2018-11-142-1/+7
| | | | | |
| * | | | | Autogen: Add and use cmQtAutoGenInitializer::InfoWriter classSebastian Holtermann2018-11-142-145/+232
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new ``cmQtAutoGenInitializer::InfoWriter`` class provides an interface to write strings/vectors/sets/maps in CMake format into a file. Its use replaces various `cmJoin` calls that failed to address escaping of semicolons in list elements. Closes #18554
* | | | | Merge topic 'test-XcodeProject-timeout'Brad King2018-11-151-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca355d92d8 Tests: Add option for custom RunCMake.XcodeProject timeout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2614
| * | | | | Tests: Add option for custom RunCMake.XcodeProject timeoutBrad King2018-11-141-0/+7
| |/ / / / | | | | | | | | | | | | | | | The test has many cases and can take a long time on busy machines.
* | | | | Merge topic 'doc-developer-to-source-guide'Brad King2018-11-154-584/+552
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a82282a08c Help/dev: Factor out a CMake Documentation Guide for developing the docs bfbc5241e9 Help: Fix policy markup example in cmake-developer(7) 3e5a047f1a Help: Drop compile features section from cmake-developer(7) manual 06cc050c1f Help/dev: Drop 'size_t' preference from source code guide Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2615
| * | | | | Help/dev: Factor out a CMake Documentation Guide for developing the docsBrad King2018-11-144-530/+552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove this content from the `cmake-developer(7)` manual because it is relevant only to developers working on CMake itself. Move it to a guide in the developer documentation.
| * | | | | Help: Fix policy markup example in cmake-developer(7)Brad King2018-11-141-1/+1
| | | | | |
| * | | | | Help: Drop compile features section from cmake-developer(7) manualBrad King2018-11-141-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer add granular compile features. Only language standard meta features like `cxx_std_##`` need to be added, and these can be done by following existing patterns.
| * | | | | Help/dev: Drop 'size_t' preference from source code guideBrad King2018-11-141-7/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | We now use `std::size_t` in several places and it is fully supported by C++11 compilers. Drop the recommendation to prefer plain `size_t`.
* | | | | Merge topic 'macro3'Brad King2018-11-152-15/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22cca9b810 Help: describe differences between macro and function. b90ae70a3b Help: in macro vs function example, use lowercase names. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2616
| * | | | | Help: describe differences between macro and function.Joachim Wuttke (l)2018-11-142-10/+38
| | | | | |
| * | | | | Help: in macro vs function example, use lowercase names.Joachim Wuttke (l)2018-11-141-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Follow our own advise not to change cases. Omit the leading underscore.
* | | | | CMake Nightly Date StampKitware Robot2018-11-151-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'WIN32'Brad King2018-11-142-12/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 254a849864 Help: Spell out MFC b173c641c4 Help: Add links to variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2613
| * | | Help: Spell out MFCJoachim Wuttke (o)2018-11-142-10/+12
| | | | | | | | | | | | | | | | And shorten text that was hard to understand and redundant.
| * | | Help: Add links to variablesJoachim Wuttke (o)2018-11-141-4/+4
|/ / /
* | | Merge topic 'GNUInstallDirs-FreeBSD-info'Brad King2018-11-146-8/+134
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-135-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Tests: Split GNUInstallDirs expectations for FreeBSDBrad King2018-11-135-5/+127
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-11-141-1/+1
| | | |
* | | | Merge topic 'deprecate-modules2'Brad King2018-11-131-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df780bcc01 Help: Move deprecated modules to appropriate section. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2603
| * | | | Help: Move deprecated modules to appropriate section.Joachim Wuttke (l)2018-11-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move deprecated or obsolete modules to the section "Deprectated Modules" of cmake-modules(7): - MacroAddFileDependencies (Text says: Using the macro MACRO_ADD_FILE_DEPENDENCIES() is discouraged.) - UsePkgConfig (Text calls it "obsolete") - Use_wxWindows (was already listed in deprecation section)
* | | | | Merge topic 'macro+function-invocation'Brad King2018-11-132-37/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abb5945bd0 Help: Document that function invocation is case-insensitive 357cdee3a1 Help: Document that macro invocation is case-insensitive Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2607
| * | | | | Help: Document that function invocation is case-insensitiveJoachim Wuttke (l)2018-11-131-21/+46
| | | | | |
| * | | | | Help: Document that macro invocation is case-insensitiveJoachim Wuttke (l)2018-11-131-16/+42
|/ / / / /
* | | | | Merge topic 'macro'Brad King2018-11-131-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcf11cbcdc Help: Mention endmacro argument as legacy only. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2606
| * | | | | Help: Mention endmacro argument as legacy only.Joachim Wuttke (l)2018-11-131-1/+6
| |/ / / / | | | | | | | | | | | | | | | Same change as previously done for function, if, while, ...
* | | | | 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
generated by cgit v0.12 at 2025-01-08 16:09:31 (GMT)