[Cmake-commits] CMake branch, master, updated. v3.13.3-1245-g24bee42
Kitware Robot
kwrobot at kitware.com
Thu Jan 31 11:13:03 EST 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 24bee427b5da710c5f9941f5cddb455df1a2ea82 (commit)
via 9aef4a732ba6b0d20c9953d171514fa4c0daaddf (commit)
via 1b3b0fa43a51aed03f38b98f30d9383bc6d377d6 (commit)
via 74cba6a3fde29649a924bc54269ed3449743eb5f (commit)
via a37614667d2a1d7d3e4db5e1ec8df644bfbe39fa (commit)
via e3b26f0004e20c11818e8c6cdd6c778c379d8c67 (commit)
via c22e373a3077a90a4f1ed509774412a0ab82d992 (commit)
via ec027aa64a8f5ee59d4962673cc8e8ec1abd5d85 (commit)
via be7b30f67e7e5c8b0186ba622dc06ce8ffe2df4e (commit)
via b323407235a3671eb11c7a039ce1c2f134025c73 (commit)
via 9d20fe014f3b81fa7d7a3b7d203b58abe6fd5ce6 (commit)
via dfb2d6178e68379683a012c7c9306b851c1350a6 (commit)
via ba30b94435bc621767fb887d081a257cdec8a633 (commit)
via 9c4cdc43f68c46984cbf7ce7d5f22aadcdde1a00 (commit)
from 591899bc9643881610f665ac2e8787774a6b78b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24bee427b5da710c5f9941f5cddb455df1a2ea82
commit 24bee427b5da710c5f9941f5cddb455df1a2ea82
Merge: 9aef4a7 a376146
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 31 16:10:44 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 31 11:12:27 2019 -0500
Merge topic 'update-kwsys'
a37614667d Configure KWSys to honor CMake_NO_CXX_STANDARD
e3b26f0004 Merge branch 'upstream-KWSys' into update-kwsys
c22e373a30 KWSys 2019-01-30 (ce89cada)
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2886
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9aef4a732ba6b0d20c9953d171514fa4c0daaddf
commit 9aef4a732ba6b0d20c9953d171514fa4c0daaddf
Merge: 1b3b0fa 9d20fe0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 31 16:09:54 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 31 11:11:28 2019 -0500
Merge topic 'variables1'
9d20fe014f Help: moved 7 variables to "internal" section
dfb2d6178e Help: "internal variables" instead of "obsolete", with some explanatory prose
9c4cdc43f6 Help: declare CMAKE_HOME_DIRECTORY obsolete
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2881
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b3b0fa43a51aed03f38b98f30d9383bc6d377d6
commit 1b3b0fa43a51aed03f38b98f30d9383bc6d377d6
Merge: 74cba6a ec027aa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 31 16:09:46 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 31 11:10:03 2019 -0500
Merge topic 'msys_docs'
ec027aa64a Help: Add documentation for MSYS variable
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2882
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74cba6a3fde29649a924bc54269ed3449743eb5f
commit 74cba6a3fde29649a924bc54269ed3449743eb5f
Merge: 591899b be7b30f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 31 16:08:09 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 31 11:08:19 2019 -0500
Merge topic 'lapack-docs'
be7b30f67e Find{BLAS,LAPACK}: Add note and example for using Intel MKL
b323407235 Find{BLAS,LAPACK}: Update docs to use modern conventions
ba30b94435 FindLAPACK: Remove extra indentation from a line
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2880
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a37614667d2a1d7d3e4db5e1ec8df644bfbe39fa
commit a37614667d2a1d7d3e4db5e1ec8df644bfbe39fa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 30 10:39:41 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 30 10:39:41 2019 -0500
Configure KWSys to honor CMake_NO_CXX_STANDARD
KWSys now computes a default `CMAKE_CXX_STANDARD` value if it is
not told what standard to use. When `CMake_NO_CXX_STANDARD` is
enabled, tell KWSys not to do that.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75a0b52..bd130ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -332,6 +332,9 @@ macro (CMAKE_BUILD_UTILITIES)
set(KWSYS_USE_ConsoleBuf 1)
set(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
set(KWSYS_INSTALL_DOC_DIR "${CMAKE_DOC_DIR}")
+ if(CMake_NO_CXX_STANDARD)
+ set(KWSYS_CXX_STANDARD "")
+ endif()
add_subdirectory(Source/kwsys)
set(kwsys_folder "Utilities/KWSys")
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE} "${kwsys_folder}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3b26f0004e20c11818e8c6cdd6c778c379d8c67
commit e3b26f0004e20c11818e8c6cdd6c778c379d8c67
Merge: 748d024 c22e373
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 30 10:36:24 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 30 10:36:24 2019 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-01-30 (ce89cada)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c22e373a3077a90a4f1ed509774412a0ab82d992
commit c22e373a3077a90a4f1ed509774412a0ab82d992
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Wed Jan 30 10:35:38 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 30 10:36:23 2019 -0500
KWSys 2019-01-30 (ce89cada)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit ce89cada1c48be31e6294a984b15c2c75b66eab0 (master).
Upstream Shortlog
-----------------
Brad King (2):
5d92e8d9 Require CMake 3.1 or higher for KWSys
6db3c607 Require C++11 or higher to compile KWSys
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b33aa80..e7da994 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,10 @@
# SET(KWSYS_HEADER_ROOT ${PROJECT_BINARY_DIR})
# INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR})
#
+# KWSYS_CXX_STANDARD = A value for CMAKE_CXX_STANDARD within KWSys.
+# Set to empty string to use no default value.
+# KWSYS_CXX_COMPILE_FEATURES = target_compile_features arguments for KWSys.
+#
# Optional settings to setup install rules are as follows:
#
# KWSYS_INSTALL_BIN_DIR = The installation target directories into
@@ -82,25 +86,17 @@
# any outside mailing list and no documentation of the change will be
# written.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
FOREACH(p
- CMP0022 # CMake 2.8, Define link interface - required by android_mk export
- CMP0025 # CMake 3.0, Compiler id for Apple Clang is now AppleClang.
- CMP0042 # CMake 3.0, MACOSX_RPATH is enabled by default.
- CMP0048 # CMake 3.0, Let the project command manage version variables.
CMP0056 # CMake 3.2, Honor link flags in try_compile() source-file signature.
CMP0063 # CMake 3.3, Honor visibility properties for all target types.
+ CMP0067 # CMake 3.8, Honor language standard in try_compile source-file signature.
CMP0069 # CMake 3.9, INTERPROCEDURAL_OPTIMIZATION is enforced when enabled.
)
IF(POLICY ${p})
CMAKE_POLICY(SET ${p} NEW)
ENDIF()
ENDFOREACH()
-SET(CMAKE_LEGACY_CYGWIN_WIN32 0)
-
-IF(CMAKE_VERSION VERSION_LESS 3.0)
- SET(KWSYS_SPLIT_OBJECTS_FROM_INTERFACE 0)
-ENDIF()
#-----------------------------------------------------------------------------
# If a namespace is not specified, use "kwsys" and enable testing.
@@ -121,6 +117,12 @@ SET_PROPERTY(DIRECTORY
"KWSYS_HEADER(%)=<${KWSYS_NAMESPACE}/%>"
)
+if(KWSYS_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD "${KWSYS_CXX_STANDARD}")
+elseif(NOT DEFINED CMAKE_CXX_STANDARD AND NOT DEFINED KWSYS_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 11)
+endif()
+
# Select library components.
IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
SET(KWSYS_ENABLE_C 1)
@@ -884,6 +886,8 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
${KWSYS_TARGET_INTERFACE})
TARGET_SOURCES(${KWSYS_TARGET_LINK} INTERFACE
$<TARGET_OBJECTS:${KWSYS_TARGET_OBJECT}>)
+ target_compile_features(${KWSYS_TARGET_OBJECT} PRIVATE ${KWSYS_CXX_COMPILE_FEATURES})
+ target_compile_features(${KWSYS_TARGET_INTERFACE} INTERFACE ${KWSYS_CXX_COMPILE_FEATURES})
ELSE()
SET(KWSYS_TARGET_INTERFACE ${KWSYS_NAMESPACE})
SET(KWSYS_TARGET_OBJECT ${KWSYS_NAMESPACE})
@@ -892,6 +896,7 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
SET(KWSYS_LINK_DEPENDENCY PUBLIC)
ADD_LIBRARY(${KWSYS_TARGET_INTERFACE} ${KWSYS_LIBRARY_TYPE}
${KWSYS_C_SRCS} ${KWSYS_CXX_SRCS})
+ target_compile_features(${KWSYS_TARGET_INTERFACE} PUBLIC ${KWSYS_CXX_COMPILE_FEATURES})
ENDIF()
if (KWSYS_ALIAS_TARGET)
add_library(${KWSYS_ALIAS_TARGET} ALIAS ${KWSYS_TARGET_INTERFACE})
diff --git a/kwsysPlatformTests.cmake b/kwsysPlatformTests.cmake
index 5386a49..28d3f68 100644
--- a/kwsysPlatformTests.cmake
+++ b/kwsysPlatformTests.cmake
@@ -7,11 +7,16 @@ SET(KWSYS_PLATFORM_TEST_FILE_CXX kwsysPlatformTestsCXX.cxx)
MACRO(KWSYS_PLATFORM_TEST lang var description invert)
IF(NOT DEFINED ${var}_COMPILED)
MESSAGE(STATUS "${description}")
+ set(maybe_cxx_standard "")
+ if(CMAKE_VERSION VERSION_LESS 3.8 AND CMAKE_CXX_STANDARD)
+ set(maybe_cxx_standard "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}")
+ endif()
TRY_COMPILE(${var}_COMPILED
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/${KWSYS_PLATFORM_TEST_FILE_${lang}}
COMPILE_DEFINITIONS -DTEST_${var} ${KWSYS_PLATFORM_TEST_DEFINES} ${KWSYS_PLATFORM_TEST_EXTRA_FLAGS}
CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=${KWSYS_PLATFORM_TEST_LINK_LIBRARIES}"
+ ${maybe_cxx_standard}
OUTPUT_VARIABLE OUTPUT)
IF(${var}_COMPILED)
FILE(APPEND
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec027aa64a8f5ee59d4962673cc8e8ec1abd5d85
commit ec027aa64a8f5ee59d4962673cc8e8ec1abd5d85
Author: Harry Mallon <hjmallon at gmail.com>
AuthorDate: Wed Jan 30 13:16:02 2019 +0000
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 30 10:20:59 2019 -0500
Help: Add documentation for MSYS variable
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index de4ce3d..5a16795 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -276,6 +276,7 @@ Variables that Describe the System
/variable/MSVC_IDE
/variable/MSVC_TOOLSET_VERSION
/variable/MSVC_VERSION
+ /variable/MSYS
/variable/UNIX
/variable/WIN32
/variable/WINCE
diff --git a/Help/variable/MSYS.rst b/Help/variable/MSYS.rst
new file mode 100644
index 0000000..25ddc7f
--- /dev/null
+++ b/Help/variable/MSYS.rst
@@ -0,0 +1,4 @@
+MSYS
+----
+
+``True`` when using the :generator:`MSYS Makefiles` generator.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be7b30f67e7e5c8b0186ba622dc06ce8ffe2df4e
commit be7b30f67e7e5c8b0186ba622dc06ce8ffe2df4e
Author: Michael Hirsch, Ph.D <scivision at users.noreply.github.com>
AuthorDate: Tue Jan 29 14:31:01 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 30 10:16:08 2019 -0500
Find{BLAS,LAPACK}: Add note and example for using Intel MKL
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 3fc30c4..b246ae5 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -72,6 +72,17 @@ This module defines the following variables:
to use BLAS95 interface
``BLAS95_FOUND``
library implementing the BLAS95 interface is found
+
+.. note::
+
+ C or CXX must be enabled to use Intel MKL
+
+ For example, to use Intel MKL libraries and/or Intel compiler:
+
+ .. code-block:: cmake
+
+ set(BLA_VENDOR Intel10_64lp)
+ find_package(BLAS)
#]=======================================================================]
include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 69eed9a..7f8d5a1 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -59,6 +59,17 @@ This module defines the following variables:
to use LAPACK95
``LAPACK95_FOUND``
library implementing the LAPACK95 interface is found
+
+.. note::
+
+ C or CXX must be enabled to use Intel MKL
+
+ For example, to use Intel MKL libraries and/or Intel compiler:
+
+ .. code-block:: cmake
+
+ set(BLA_VENDOR Intel10_64lp)
+ find_package(LAPACK)
#]=======================================================================]
set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b323407235a3671eb11c7a039ce1c2f134025c73
commit b323407235a3671eb11c7a039ce1c2f134025c73
Author: Michael Hirsch, Ph.D <scivision at users.noreply.github.com>
AuthorDate: Tue Jan 29 14:31:01 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 30 10:15:00 2019 -0500
Find{BLAS,LAPACK}: Update docs to use modern conventions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index b6348fd..3fc30c4 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -13,62 +13,65 @@ list of libraries searched for is taken from the autoconf macro file,
acx_blas.m4 (distributed at
http://ac-archive.sourceforge.net/ac-archive/acx_blas.html).
-This module sets the following variables:
-
-::
-
- BLAS_FOUND - set to true if a library implementing the BLAS interface
- is found
- BLAS_LINKER_FLAGS - uncached list of required linker flags (excluding -l
- and -L).
- BLAS_LIBRARIES - uncached list of libraries (using full path name) to
- link against to use BLAS (may be empty if compiler implicitly links
- BLAS)
- BLAS95_LIBRARIES - uncached list of libraries (using full path name)
- to link against to use BLAS95 interface
- BLAS95_FOUND - set to true if a library implementing the BLAS f95 interface
- is found
-
-The following variables can be used to control this module:
-
-::
-
- BLA_STATIC if set on this determines what kind of linkage we do (static)
- BLA_VENDOR if set checks only the specified vendor, if not set checks
- all the possibilities
- BLA_F95 if set on tries to find the f95 interfaces for BLAS/LAPACK
- BLA_PREFER_PKGCONFIG if set pkg-config will be used to search for a BLAS
- library first and if one is found that is preferred
-
-List of vendors (BLA_VENDOR) valid in this module:
-
-* Goto
-* OpenBLAS
-* FLAME
-* ATLAS PhiPACK
-* CXML
-* DXML
-* SunPerf
-* SCSL
-* SGIMATH
-* IBMESSL
-* Intel10_32 (intel mkl v10 32 bit)
-* Intel10_64lp (intel mkl v10+ 64 bit, threaded code, lp64 model)
-* Intel10_64lp_seq (intel mkl v10+ 64 bit, sequential code, lp64 model)
-* Intel10_64ilp (intel mkl v10+ 64 bit, threaded code, ilp64 model)
-* Intel10_64ilp_seq (intel mkl v10+ 64 bit, sequential code, ilp64 model)
-* Intel (older versions of mkl 32 and 64 bit)
-* ACML
-* ACML_MP
-* ACML_GPU
-* Apple
-* NAS
-* Generic
-
-.. note::
-
- C/CXX should be enabled to use Intel mkl
-
+Input Variables
+^^^^^^^^^^^^^^^
+
+The following variables may be set to influence this module's behavior:
+
+``BLA_STATIC``
+ if ``ON`` use static linkage
+
+``BLA_VENDOR``
+ If set, checks only the specified vendor, if not set checks all the
+ possibilities. List of vendors valid in this module:
+
+ * Goto
+ * OpenBLAS
+ * FLAME
+ * ATLAS PhiPACK
+ * CXML
+ * DXML
+ * SunPerf
+ * SCSL
+ * SGIMATH
+ * IBMESSL
+ * Intel10_32 (intel mkl v10 32 bit)
+ * Intel10_64lp (intel mkl v10+ 64 bit, threaded code, lp64 model)
+ * Intel10_64lp_seq (intel mkl v10+ 64 bit, sequential code, lp64 model)
+ * Intel10_64ilp (intel mkl v10+ 64 bit, threaded code, ilp64 model)
+ * Intel10_64ilp_seq (intel mkl v10+ 64 bit, sequential code, ilp64 model)
+ * Intel (obsolete versions of mkl 32 and 64 bit)
+ * ACML
+ * ACML_MP
+ * ACML_GPU
+ * Apple
+ * NAS
+ * Generic
+
+``BLA_F95``
+ if ``ON`` tries to find the BLAS95 interfaces
+
+``BLA_PREFER_PKGCONFIG``
+ if set pkg-config will be used to search for a BLAS library first
+ and if one is found that is preferred
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+``BLAS_FOUND``
+ library implementing the BLAS interface is found
+``BLAS_LINKER_FLAGS``
+ uncached list of required linker flags (excluding -l and -L).
+``BLAS_LIBRARIES``
+ uncached list of libraries (using full path name) to link against
+ to use BLAS (may be empty if compiler implicitly links BLAS)
+``BLAS95_LIBRARIES``
+ uncached list of libraries (using full path name) to link against
+ to use BLAS95 interface
+``BLAS95_FOUND``
+ library implementing the BLAS95 interface is found
#]=======================================================================]
include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index dbd943b..69eed9a 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -14,35 +14,51 @@ The approach follows that taken for the autoconf macro file,
acx_lapack.m4 (distributed at
http://ac-archive.sourceforge.net/ac-archive/acx_lapack.html).
-This module sets the following variables:
-
-::
-
- LAPACK_FOUND - set to true if a library implementing the LAPACK interface
- is found
- LAPACK_LINKER_FLAGS - uncached list of required linker flags (excluding -l
- and -L).
- LAPACK_LIBRARIES - uncached list of libraries (using full path name) to
- link against to use LAPACK
- LAPACK95_LIBRARIES - uncached list of libraries (using full path name) to
- link against to use LAPACK95
- LAPACK95_FOUND - set to true if a library implementing the LAPACK f95
- interface is found
- BLA_STATIC if set on this determines what kind of linkage we do (static)
- BLA_VENDOR if set checks only the specified vendor, if not set checks
- all the possibilities
- BLA_F95 if set on tries to find the f95 interfaces for BLAS/LAPACK
-
-List of vendors (BLA_VENDOR) valid in this module:
-
-* Intel(mkl)
-* OpenBLAS
-* FLAME
-* ACML
-* Apple
-* NAS
-* Generic
-
+Input Variables
+^^^^^^^^^^^^^^^
+
+The following variables may be set to influence this module's behavior:
+
+``BLA_STATIC``
+ if ``ON`` use static linkage
+
+``BLA_VENDOR``
+ If set, checks only the specified vendor, if not set checks all the
+ possibilities. List of vendors valid in this module:
+
+ * ``Intel10_32`` (intel mkl v10 32 bit)
+ * ``Intel10_64lp`` (intel mkl v10+ 64 bit, threaded code, lp64 model)
+ * ``Intel10_64lp_seq`` (intel mkl v10+ 64 bit, sequential code, lp64 model)
+ * ``Intel10_64ilp`` (intel mkl v10+ 64 bit, threaded code, ilp64 model)
+ * ``Intel10_64ilp_seq`` (intel mkl v10+ 64 bit, sequential code, ilp64 model)
+ * ``Intel`` (obsolete versions of mkl 32 and 64 bit)
+ * ``OpenBLAS``
+ * ``FLAME``
+ * ``ACML``
+ * ``Apple``
+ * ``NAS``
+ * ``Generic``
+
+``BLA_F95``
+ if ``ON`` tries to find BLAS95/LAPACK95
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+``LAPACK_FOUND``
+ library implementing the LAPACK interface is found
+``LAPACK_LINKER_FLAGS``
+ uncached list of required linker flags (excluding -l and -L).
+``LAPACK_LIBRARIES``
+ uncached list of libraries (using full path name) to link against
+ to use LAPACK
+``LAPACK95_LIBRARIES``
+ uncached list of libraries (using full path name) to link against
+ to use LAPACK95
+``LAPACK95_FOUND``
+ library implementing the LAPACK95 interface is found
#]=======================================================================]
set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d20fe014f3b81fa7d7a3b7d203b58abe6fd5ce6
commit 9d20fe014f3b81fa7d7a3b7d203b58abe6fd5ce6
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Wed Jan 30 16:11:16 2019 +0100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Wed Jan 30 16:13:13 2019 +0100
Help: moved 7 variables to "internal" section
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index a4bbdb3..0e4653d 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -102,7 +102,6 @@ Variables that Provide Information
/variable/CMAKE_VERBOSE_MAKEFILE
/variable/CMAKE_VERSION
/variable/CMAKE_VS_DEVENV_COMMAND
- /variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION
/variable/CMAKE_VS_MSBUILD_COMMAND
/variable/CMAKE_VS_NsightTegra_VERSION
/variable/CMAKE_VS_PLATFORM_NAME
@@ -191,7 +190,6 @@ Variables that Change Behavior
/variable/CMAKE_MFC_FLAG
/variable/CMAKE_MAXIMUM_RECURSION_DEPTH
/variable/CMAKE_MODULE_PATH
- /variable/CMAKE_NOT_USING_CONFIG_FLAGS
/variable/CMAKE_POLICY_DEFAULT_CMPNNNN
/variable/CMAKE_POLICY_WARNING_CMPNNNN
/variable/CMAKE_PREFIX_PATH
@@ -450,7 +448,6 @@ Variables for Languages
/variable/CMAKE_Fortran_MODDIR_DEFAULT
/variable/CMAKE_Fortran_MODDIR_FLAG
/variable/CMAKE_Fortran_MODOUT_FLAG
- /variable/CMAKE_INTERNAL_PLATFORM_ABI
/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE
/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX
/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX
@@ -458,15 +455,12 @@ Variables for Languages
/variable/CMAKE_LANG_ARCHIVE_CREATE
/variable/CMAKE_LANG_ARCHIVE_FINISH
/variable/CMAKE_LANG_COMPILER
- /variable/CMAKE_LANG_COMPILER_ABI
- /variable/CMAKE_LANG_COMPILER_ARCHITECTURE_ID
/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN
/variable/CMAKE_LANG_COMPILER_ID
/variable/CMAKE_LANG_COMPILER_LOADED
/variable/CMAKE_LANG_COMPILER_PREDEFINES_COMMAND
/variable/CMAKE_LANG_COMPILER_TARGET
/variable/CMAKE_LANG_COMPILER_VERSION
- /variable/CMAKE_LANG_COMPILER_VERSION_INTERNAL
/variable/CMAKE_LANG_COMPILE_OBJECT
/variable/CMAKE_LANG_CREATE_SHARED_LIBRARY
/variable/CMAKE_LANG_CREATE_SHARED_MODULE
@@ -495,7 +489,6 @@ Variables for Languages
/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG_SEP
/variable/CMAKE_LANG_LINK_EXECUTABLE
/variable/CMAKE_LANG_OUTPUT_EXTENSION
- /variable/CMAKE_LANG_PLATFORM_ID
/variable/CMAKE_LANG_SIMULATE_ID
/variable/CMAKE_LANG_SIMULATE_VERSION
/variable/CMAKE_LANG_SIZEOF_DATA_PTR
@@ -620,3 +613,10 @@ are subject to change, and not recommended for use in project code.
:maxdepth: 1
/variable/CMAKE_HOME_DIRECTORY
+ /variable/CMAKE_INTERNAL_PLATFORM_ABI
+ /variable/CMAKE_LANG_COMPILER_ABI
+ /variable/CMAKE_LANG_COMPILER_ARCHITECTURE_ID
+ /variable/CMAKE_LANG_COMPILER_VERSION_INTERNAL
+ /variable/CMAKE_LANG_PLATFORM_ID
+ /variable/CMAKE_NOT_USING_CONFIG_FLAGS
+ /variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfb2d6178e68379683a012c7c9306b851c1350a6
commit dfb2d6178e68379683a012c7c9306b851c1350a6
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Wed Jan 30 16:06:26 2019 +0100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Wed Jan 30 16:13:10 2019 +0100
Help: "internal variables" instead of "obsolete", with some explanatory prose
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 83a1ccd..a4bbdb3 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -608,9 +608,14 @@ Variable Expansion Operators
/variable/CACHE
/variable/ENV
-Obsolete Variables
+Internal Variables
==================
+CMake has many internal variables. Most of them are undocumented.
+Some of them, however, were at some point described as normal
+variables, and therefore may be encountered in legacy code. They
+are subject to change, and not recommended for use in project code.
+
.. toctree::
:maxdepth: 1
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba30b94435bc621767fb887d081a257cdec8a633
commit ba30b94435bc621767fb887d081a257cdec8a633
Author: Michael Hirsch, Ph.D <scivision at users.noreply.github.com>
AuthorDate: Tue Jan 29 14:31:01 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 30 08:20:10 2019 -0500
FindLAPACK: Remove extra indentation from a line
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 7619664..dbd943b 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -113,7 +113,7 @@ foreach(_library ${_list})
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif ()
else ()
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
# for ubuntu's libblas3gf and liblapack3gf packages
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)
endif ()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c4cdc43f68c46984cbf7ce7d5f22aadcdde1a00
commit 9c4cdc43f68c46984cbf7ce7d5f22aadcdde1a00
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Wed Jan 30 13:04:56 2019 +0100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Wed Jan 30 13:04:56 2019 +0100
Help: declare CMAKE_HOME_DIRECTORY obsolete
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index de4ce3d..83a1ccd 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -55,7 +55,6 @@ Variables that Provide Information
/variable/CMAKE_GENERATOR_INSTANCE
/variable/CMAKE_GENERATOR_PLATFORM
/variable/CMAKE_GENERATOR_TOOLSET
- /variable/CMAKE_HOME_DIRECTORY
/variable/CMAKE_IMPORT_LIBRARY_PREFIX
/variable/CMAKE_IMPORT_LIBRARY_SUFFIX
/variable/CMAKE_JOB_POOL_COMPILE
@@ -608,3 +607,11 @@ Variable Expansion Operators
/variable/CACHE
/variable/ENV
+
+Obsolete Variables
+==================
+
+.. toctree::
+ :maxdepth: 1
+
+ /variable/CMAKE_HOME_DIRECTORY
diff --git a/Help/variable/CMAKE_HOME_DIRECTORY.rst b/Help/variable/CMAKE_HOME_DIRECTORY.rst
index fdc5d81..b03d956 100644
--- a/Help/variable/CMAKE_HOME_DIRECTORY.rst
+++ b/Help/variable/CMAKE_HOME_DIRECTORY.rst
@@ -1,6 +1,9 @@
CMAKE_HOME_DIRECTORY
--------------------
-Path to top of source tree.
+Path to top of source tree. Same as :variable:`CMAKE_SOURCE_DIR`.
-This is the path to the top level of the source tree.
+This is an internal cache entry used to locate the source directory
+when loading a ``CMakeCache.txt`` from a build tree. It should not
+be used in project code. The variable :variable:`CMAKE_SOURCE_DIR`
+has the same value and should be preferred.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 3 +
Help/manual/cmake-variables.7.rst | 29 +++++---
Help/variable/CMAKE_HOME_DIRECTORY.rst | 7 +-
Help/variable/MSYS.rst | 4 ++
Modules/FindBLAS.cmake | 118 ++++++++++++++++++---------------
Modules/FindLAPACK.cmake | 87 +++++++++++++++---------
Source/kwsys/CMakeLists.txt | 25 ++++---
Source/kwsys/kwsysPlatformTests.cmake | 5 ++
8 files changed, 176 insertions(+), 102 deletions(-)
create mode 100644 Help/variable/MSYS.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list