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 f49efe283ed005aac642f5af58ea971d468de88c (commit)
via e3ec57483464b4c509e9f8b24e4ac8c6990f823b (commit)
via bae71966fb35649dda8fc4f962316e3dbea8f787 (commit)
via 2a6e8644dd9650c7c749990410a5c50f12a786cb (commit)
via 4833d2ef45cccb8f3e6b5a48f9747386fd9193ac (commit)
via 43deb8e004bcf143df8757c65ea5b5fa33bda893 (commit)
via 4aad340ec446e3def2bda4f2d474ab0cf86e902e (commit)
via 85a035bf00d53d33251f30f850be7be169cbcde8 (commit)
via 2cf836fa5ee71417145ec93e8f962d08c4a7d565 (commit)
via f54d28a838ca7d4efbbd0155c4f61c287ae2b9cb (commit)
via 1f531e0428d0aa5804fd8f4d1b58fe69edc30eed (commit)
via 0369362132b3deae30828299131647cc3754abeb (commit)
via d9195ab081b9c23a96d5a9c1b8e8be4da4f6e976 (commit)
via 0d80977af4bbd1c76448307f577a7f22db792e65 (commit)
via c259912b14fc63db0441c30c33b79ebbef058e06 (commit)
via 1ca53f5ef1335561d952603d48c48da549d41271 (commit)
via 15ac4aae0e3199fe8ac7f46cf4eb064cbeb1660d (commit)
via 3125c47d27d4d57cb31e10c4bd658fc1e352299d (commit)
via 36bbd07a765820ddbcaef3db4e2a78d95910f5e1 (commit)
via e1dfe8cee619be2db2dcccfae5381376d336c6a3 (commit)
via d5f691be0b78a48e836dc42b97d000ba151c44d6 (commit)
via 8b63265ea53dbd2e035a6b616ba0e82bfc0decc0 (commit)
via ede1715c1d4f35e806e3dabddd09c39eeed9a628 (commit)
via 03879b11af0b2179d879358df3cce3c2b7acb047 (commit)
via b4edf7b5d2b2ba8eccfa0230dad98d0815a17d5d (commit)
via fc149a72f7e9128c0ad54014d745500fd31eea36 (commit)
via f0d52f55f155ac3f3e2bafa072a4e0d7f1431d76 (commit)
from cee843475d82150cc56d12badd04eb737bff6551 (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=f49efe283ed005aac642f5af58ea971d468de88c
commit f49efe283ed005aac642f5af58ea971d468de88c
Merge: e3ec574 0d80977
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 27 13:51:18 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 27 08:51:27 2018 -0500
Merge topic 'autogen_target_docs'
0d80977af4 Autogen: Documentation updates
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2659
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3ec57483464b4c509e9f8b24e4ac8c6990f823b
commit e3ec57483464b4c509e9f8b24e4ac8c6990f823b
Merge: bae7196 85a035b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 27 13:50:00 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 27 08:50:07 2018 -0500
Merge topic 'FindDoxygen-win-glob'
85a035bf00 FindDoxygen: Avoid Windows-specific GLOB on other platforms
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2660
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bae71966fb35649dda8fc4f962316e3dbea8f787
commit bae71966fb35649dda8fc4f962316e3dbea8f787
Merge: 2a6e864 d9195ab
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 27 13:48:33 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 27 08:48:49 2018 -0500
Merge topic 'ctest-updates'
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 <kwro...@kitware.com>
Merge-request: !2640
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a6e8644dd9650c7c749990410a5c50f12a786cb
commit 2a6e8644dd9650c7c749990410a5c50f12a786cb
Merge: 4833d2e c259912
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 27 13:48:00 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 27 08:48:08 2018 -0500
Merge topic 'blaslapack_mkl_gfortran'
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 <kwro...@kitware.com>
Merge-request: !2633
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4833d2ef45cccb8f3e6b5a48f9747386fd9193ac
commit 4833d2ef45cccb8f3e6b5a48f9747386fd9193ac
Merge: 43deb8e 2cf836f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 27 08:45:18 2018 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 27 08:45:18 2018 -0500
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43deb8e004bcf143df8757c65ea5b5fa33bda893
commit 43deb8e004bcf143df8757c65ea5b5fa33bda893
Merge: 4aad340 f54d28a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 27 13:44:34 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 27 08:45:00 2018 -0500
Merge topic 'vs2015-no-sdk'
f54d28a838 VS: Avoid crash with VS 2015 when all SDKs are higher than
10.0.14393.0
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2656
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4aad340ec446e3def2bda4f2d474ab0cf86e902e
commit 4aad340ec446e3def2bda4f2d474ab0cf86e902e
Merge: cee8434 0369362
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 27 13:44:03 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 27 08:44:11 2018 -0500
Merge topic 'FindBoost-no-cxx'
0369362132 FindBoost: Restore finding without CXX language enabled
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2663
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85a035bf00d53d33251f30f850be7be169cbcde8
commit 85a035bf00d53d33251f30f850be7be169cbcde8
Author: Noel Eck <noel....@intel.com>
AuthorDate: Mon Nov 26 16:25:26 2018 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 26 14:39:36 2018 -0500
FindDoxygen: Avoid Windows-specific GLOB on other platforms
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....@intel.com>
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 2ed9449..fdd3a92 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -485,12 +485,18 @@ endmacro()
# Find Graphviz Dot...
#
macro(_Doxygen_find_dot)
- set(_x86 "(x86)")
- file(
- GLOB _Doxygen_GRAPHVIZ_BIN_DIRS
- "$ENV{ProgramFiles}/Graphviz*/bin"
- "$ENV{ProgramFiles${_x86}}/Graphviz*/bin"
- )
+ if(WIN32)
+ set(_x86 "(x86)")
+ file(
+ GLOB _Doxygen_GRAPHVIZ_BIN_DIRS
+ "$ENV{ProgramFiles}/Graphviz*/bin"
+ "$ENV{ProgramFiles${_x86}}/Graphviz*/bin"
+ )
+ unset(_x86)
+ else()
+ set(_Doxygen_GRAPHVIZ_BIN_DIRS "")
+ endif()
+
find_program(
DOXYGEN_DOT_EXECUTABLE
NAMES dot
@@ -529,7 +535,6 @@ macro(_Doxygen_find_dot)
endif()
unset(_Doxygen_GRAPHVIZ_BIN_DIRS)
- unset(_x86)
endmacro()
#
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9195ab081b9c23a96d5a9c1b8e8be4da4f6e976
commit d9195ab081b9c23a96d5a9c1b8e8be4da4f6e976
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 26 08:05:13 2018 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 26 08:05:13 2018 -0500
Tests: Teach run_ctest to handle removal of CTestConfig.cmake
When running tests in a non-fresh build tree there may be files left
from previous test runs. In the case that a test removes
`CTestConfig.cmake.in`, we must remove any `CTestConfig.cmake` that
may have been left behind.
diff --git a/Tests/RunCMake/RunCTest.cmake b/Tests/RunCMake/RunCTest.cmake
index c2c31d1..98fdf20 100644
--- a/Tests/RunCMake/RunCTest.cmake
+++ b/Tests/RunCMake/RunCTest.cmake
@@ -6,6 +6,8 @@ function(run_ctest CASE_NAME)
if(EXISTS "${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in")
configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
+ else()
+ file(REMOVE ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake)
endif()
configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d80977af4bbd1c76448307f577a7f22db792e65
commit 0d80977af4bbd1c76448307f577a7f22db792e65
Author: Sebastian Holtermann <sebh...@xwmw.org>
AuthorDate: Mon Nov 26 09:53:40 2018 +0100
Commit: Sebastian Holtermann <sebh...@xwmw.org>
CommitDate: Mon Nov 26 09:57:20 2018 +0100
Autogen: Documentation updates
This extends the documentation for
- :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS`
- :prop_tgt:`AUTOGEN_TARGET_DEPENDS`
- :variable:`CMAKE_GLOBAL_AUTOGEN_TARGET`
diff --git a/Help/prop_tgt/AUTOGEN_ORIGIN_DEPENDS.rst
b/Help/prop_tgt/AUTOGEN_ORIGIN_DEPENDS.rst
index f61089a..022bab5 100644
--- a/Help/prop_tgt/AUTOGEN_ORIGIN_DEPENDS.rst
+++ b/Help/prop_tgt/AUTOGEN_ORIGIN_DEPENDS.rst
@@ -5,22 +5,34 @@ Switch for forwarding origin target dependencies to the
corresponding
``_autogen`` target.
Targets which have their :prop_tgt:`AUTOMOC` or :prop_tgt:`AUTOUIC` property
-``ON`` have a corresponding ``_autogen`` target which is used to auto generate
+``ON`` have a corresponding ``_autogen`` target which generates
``moc`` and ``uic`` files. As this ``_autogen`` target is created at
-generate-time, it is not possible to define dependencies of it,
-such as to create inputs for the ``moc`` or ``uic`` executable.
-
-The dependencies of the ``_autogen`` target are composed from
-
-- the origin target dependencies
- (by default enabled via :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS`)
-- user defined dependencies from :prop_tgt:`AUTOGEN_TARGET_DEPENDS`
-
-:prop_tgt:`AUTOGEN_ORIGIN_DEPENDS` decides whether the origin target
-dependencies should be forwarded to the ``_autogen`` target or not.
+generate-time, it is not possible to define dependencies of it using
+e.g. :command:`add_dependencies`. Instead the
+:prop_tgt:`AUTOGEN_ORIGIN_DEPENDS` target property decides whether the origin
+target dependencies should be forwarded to the ``_autogen`` target or not.
By default :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS` is initialized from
:variable:`CMAKE_AUTOGEN_ORIGIN_DEPENDS` which is ``ON`` by default.
+In total the dependencies of the ``_autogen`` target are composed from
+
+- forwarded origin target dependencies
+ (enabled by default via :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS`)
+- additional user defined dependencies from :prop_tgt:`AUTOGEN_TARGET_DEPENDS`
+
See the :manual:`cmake-qt(7)` manual for more information on using CMake
with Qt.
+
+Note
+^^^^
+
+Disabling :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS` is useful to avoid building of
+origin target dependencies when building the ``_autogen`` target only.
+This is especially interesting when a
+:variable:`global autogen target <CMAKE_GLOBAL_AUTOGEN_TARGET>` is enabled.
+
+When the ``_autogen`` target doesn't require all the origin target's
+dependencies, and :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS` is disabled, it might be
+necessary to extend :prop_tgt:`AUTOGEN_TARGET_DEPENDS` to add missing
+dependencies.
diff --git a/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
b/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
index 84c2bfe..d5c5e14 100644
--- a/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
+++ b/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
@@ -1,23 +1,22 @@
AUTOGEN_TARGET_DEPENDS
----------------------
-Target dependencies of the corresponding ``_autogen`` target.
+Additional target dependencies of the corresponding ``_autogen`` target.
Targets which have their :prop_tgt:`AUTOMOC` or :prop_tgt:`AUTOUIC` property
-``ON`` have a corresponding ``_autogen`` target which is used to auto generate
+``ON`` have a corresponding ``_autogen`` target which generates
``moc`` and ``uic`` files. As this ``_autogen`` target is created at
-generate-time, it is not possible to define dependencies of it,
-such as to create inputs for the ``moc`` or ``uic`` executable.
+generate-time, it is not possible to define dependencies of it using
+e.g. :command:`add_dependencies`. Instead the
+:prop_tgt:`AUTOGEN_TARGET_DEPENDS` target property can be set to a
+:ref:`;-list <CMake Language Lists>` of additional dependencies for the
+``_autogen`` target. Dependencies can be target names or file names.
-The dependencies of the ``_autogen`` target are composed from
+In total the dependencies of the ``_autogen`` target are composed from
-- the origin target dependencies
- (by default enabled via :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS`)
-- user defined dependencies from :prop_tgt:`AUTOGEN_TARGET_DEPENDS`
-
-The :prop_tgt:`AUTOGEN_TARGET_DEPENDS` target property can be set to a
-list of additional dependencies for the ``_autogen`` target. Dependencies
-can be target names or file names.
+- forwarded origin target dependencies
+ (enabled by default via :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS`)
+- additional user defined dependencies from :prop_tgt:`AUTOGEN_TARGET_DEPENDS`
See the :manual:`cmake-qt(7)` manual for more information on using CMake
with Qt.
@@ -32,6 +31,6 @@ If :prop_tgt:`AUTOMOC` or :prop_tgt:`AUTOUIC` depends on a
file that is either
- a :prop_sf:`GENERATED` C++ file that isn't recognized by :prop_tgt:`AUTOMOC`
and :prop_tgt:`AUTOUIC` because it's skipped by :prop_sf:`SKIP_AUTOMOC`,
:prop_sf:`SKIP_AUTOUIC`, :prop_sf:`SKIP_AUTOGEN` or :policy:`CMP0071` or
-- a file that isn't in the target's sources
+- a file that isn't in the origin target's sources
it must added to :prop_tgt:`AUTOGEN_TARGET_DEPENDS`.
diff --git a/Help/variable/CMAKE_GLOBAL_AUTOGEN_TARGET.rst
b/Help/variable/CMAKE_GLOBAL_AUTOGEN_TARGET.rst
index 75903ab..e82867d 100644
--- a/Help/variable/CMAKE_GLOBAL_AUTOGEN_TARGET.rst
+++ b/Help/variable/CMAKE_GLOBAL_AUTOGEN_TARGET.rst
@@ -16,3 +16,11 @@ By default :variable:`CMAKE_GLOBAL_AUTOGEN_TARGET` is unset.
See the :manual:`cmake-qt(7)` manual for more information on using CMake
with Qt.
+
+Note
+^^^^
+
+``<ORIGIN>_autogen`` targets by default inherit their origin target's
+dependencies. This might result in unintended dependency target
+builds when only ``<ORIGIN>_autogen`` targets are built. A solution is to
+disable :prop_tgt:`AUTOGEN_ORIGIN_DEPENDS` on the respective origin targets.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c259912b14fc63db0441c30c33b79ebbef058e06
commit c259912b14fc63db0441c30c33b79ebbef058e06
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 21:37:14 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sat Nov 24 12:14:32 2018 +0000
FindBLAS: Do not look for BLAS once BLAS95 has been found
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.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index c286a4d..cd6ed8f 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -405,6 +405,14 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
endif ()
endif ()
+if(BLA_F95)
+ find_package_handle_standard_args(BLAS REQUIRED_VARS BLAS95_LIBRARIES)
+ set(BLAS95_FOUND ${BLAS_FOUND})
+ if(BLAS_FOUND)
+ set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}")
+ endif()
+endif()
+
if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
if(NOT BLAS_LIBRARIES)
# gotoblas (http://www.tacc.utexas.edu/tacc-projects/gotoblas2)
@@ -740,13 +748,7 @@ if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL
"All")
endif()
endif ()
-if(BLA_F95)
- find_package_handle_standard_args(BLAS REQUIRED_VARS BLAS95_LIBRARIES)
- set(BLAS95_FOUND ${BLAS_FOUND})
- if(BLAS_FOUND)
- set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}")
- endif()
-else()
+if(NOT BLA_F95)
find_package_handle_standard_args(BLAS REQUIRED_VARS BLAS_LIBRARIES)
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ca53f5ef1335561d952603d48c48da549d41271
commit 1ca53f5ef1335561d952603d48c48da549d41271
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Tue Nov 20 17:08:02 2018 +0100
Commit: Regina Pfeifer <reg...@mailbox.org>
CommitDate: Tue Nov 20 21:43:27 2018 +0100
Remove unnecessary CTEST_PROJECT_NAME variables
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake
index 2ea931d..18bb452 100644
--- a/Modules/CTest.cmake
+++ b/Modules/CTest.cmake
@@ -27,7 +27,6 @@ to creating tests when testing is enabled.
To enable submissions to a CDash server, create a ``CTestConfig.cmake``
file at the top of the project with content such as::
- set(CTEST_PROJECT_NAME "MyProject")
set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "my.cdash.org")
diff --git
a/Tests/CTestBuildCommandProjectInSubdir/CTestBuildCommandProjectInSubdir.cmake.in
b/Tests/CTestBuildCommandProjectInSubdir/CTestBuildCommandProjectInSubdir.cmake.in
index 670a874..0f56781 100644
---
a/Tests/CTestBuildCommandProjectInSubdir/CTestBuildCommandProjectInSubdir.cmake.in
+++
b/Tests/CTestBuildCommandProjectInSubdir/CTestBuildCommandProjectInSubdir.cmake.in
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8.10)
set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/VSProjectInSubdir")
set(CTEST_BINARY_DIRECTORY
"@CMake_BINARY_DIR@/Tests/CTestBuildCommandProjectInSubdir/Nested")
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
-set(CTEST_PROJECT_NAME "VSProjectInSubdir")
set(CTEST_BUILD_CONFIGURATION "@CTestTest_CONFIG@")
ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
diff --git a/Tests/CTestConfig/script.cmake.in
b/Tests/CTestConfig/script.cmake.in
index b6ccedb..973c7b8 100644
--- a/Tests/CTestConfig/script.cmake.in
+++ b/Tests/CTestConfig/script.cmake.in
@@ -1,7 +1,6 @@
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
set(CTEST_CMAKE_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@")
set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
-set(CTEST_PROJECT_NAME "CTestConfig")
set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestConfig")
set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestConfig/@cfg@-script")
diff --git a/Tests/CTestCoverageCollectGCOV/test.cmake.in
b/Tests/CTestCoverageCollectGCOV/test.cmake.in
index d48ef61..2c98876 100644
--- a/Tests/CTestCoverageCollectGCOV/test.cmake.in
+++ b/Tests/CTestCoverageCollectGCOV/test.cmake.in
@@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
-set(CTEST_PROJECT_NAME "TestProject")
set(CTEST_SOURCE_DIRECTORY
"@CMake_SOURCE_DIR@/Tests/CTestCoverageCollectGCOV/TestProject")
set(CTEST_BINARY_DIRECTORY
"@CMake_BINARY_DIR@/Tests/CTestCoverageCollectGCOV/TestProject")
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
diff --git a/Tests/CTestTestBadExe/CTestConfig.cmake
b/Tests/CTestTestBadExe/CTestConfig.cmake
index c7286e2..fc5bffc 100644
--- a/Tests/CTestTestBadExe/CTestConfig.cmake
+++ b/Tests/CTestTestBadExe/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestBadExe")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestBadGenerator/CTestConfig.cmake
b/Tests/CTestTestBadGenerator/CTestConfig.cmake
index 1e61bf4..fc5bffc 100644
--- a/Tests/CTestTestBadGenerator/CTestConfig.cmake
+++ b/Tests/CTestTestBadGenerator/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestBadGenerator")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestCostSerial/CTestConfig.cmake
b/Tests/CTestTestCostSerial/CTestConfig.cmake
index 3ab99ac..faa91f0 100644
--- a/Tests/CTestTestCostSerial/CTestConfig.cmake
+++ b/Tests/CTestTestCostSerial/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestCostSerial")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestCrash/CTestConfig.cmake
b/Tests/CTestTestCrash/CTestConfig.cmake
index 5c2ca0e..fc5bffc 100644
--- a/Tests/CTestTestCrash/CTestConfig.cmake
+++ b/Tests/CTestTestCrash/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestCrash")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestCycle/CTestConfig.cmake
b/Tests/CTestTestCycle/CTestConfig.cmake
index 8aeb09b..fc5bffc 100644
--- a/Tests/CTestTestCycle/CTestConfig.cmake
+++ b/Tests/CTestTestCycle/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestCycle")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestDepends/CTestConfig.cmake
b/Tests/CTestTestDepends/CTestConfig.cmake
index 7af9200..fc5bffc 100644
--- a/Tests/CTestTestDepends/CTestConfig.cmake
+++ b/Tests/CTestTestDepends/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestDepends")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestFailure/CTestConfig.cmake
b/Tests/CTestTestFailure/CTestConfig.cmake
index 07e1be0..fc5bffc 100644
--- a/Tests/CTestTestFailure/CTestConfig.cmake
+++ b/Tests/CTestTestFailure/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestFailure")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestFdSetSize/CTestConfig.cmake
b/Tests/CTestTestFdSetSize/CTestConfig.cmake
deleted file mode 100644
index b5f3c33..0000000
--- a/Tests/CTestTestFdSetSize/CTestConfig.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTestFdSetSize")
diff --git
a/Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
index 669b0fb..409d83a 100644
--- a/Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
+++ b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
@@ -1,5 +1,4 @@
set(CTEST_USE_LAUNCHERS 1)
-set(CTEST_PROJECT_NAME "CTestTestLaunchers")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git
a/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
index 669b0fb..409d83a 100644
---
a/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
+++
b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
@@ -1,5 +1,4 @@
set(CTEST_USE_LAUNCHERS 1)
-set(CTEST_PROJECT_NAME "CTestTestLaunchers")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git
a/Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake
b/Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake
index 669b0fb..409d83a 100644
--- a/Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake
+++ b/Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake
@@ -1,5 +1,4 @@
set(CTEST_USE_LAUNCHERS 1)
-set(CTEST_PROJECT_NAME "CTestTestLaunchers")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestParallel/CTestConfig.cmake
b/Tests/CTestTestParallel/CTestConfig.cmake
index fc5b666..faa91f0 100644
--- a/Tests/CTestTestParallel/CTestConfig.cmake
+++ b/Tests/CTestTestParallel/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestParallel")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestResourceLock/CTestConfig.cmake
b/Tests/CTestTestResourceLock/CTestConfig.cmake
index c118777..faa91f0 100644
--- a/Tests/CTestTestResourceLock/CTestConfig.cmake
+++ b/Tests/CTestTestResourceLock/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestResourceLock")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestScheduler/CTestConfig.cmake
b/Tests/CTestTestScheduler/CTestConfig.cmake
index 797387b..faa91f0 100644
--- a/Tests/CTestTestScheduler/CTestConfig.cmake
+++ b/Tests/CTestTestScheduler/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestScheduler")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestSkipReturnCode/CTestConfig.cmake
b/Tests/CTestTestSkipReturnCode/CTestConfig.cmake
index da0c76b..fc5bffc 100644
--- a/Tests/CTestTestSkipReturnCode/CTestConfig.cmake
+++ b/Tests/CTestTestSkipReturnCode/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestSkipReturnCode")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestStopTime/CTestConfig.cmake
b/Tests/CTestTestStopTime/CTestConfig.cmake
index 412283e..fc5bffc 100644
--- a/Tests/CTestTestStopTime/CTestConfig.cmake
+++ b/Tests/CTestTestStopTime/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestStopTime")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestSubdir/CTestConfig.cmake
b/Tests/CTestTestSubdir/CTestConfig.cmake
index 47ebb92..faa91f0 100644
--- a/Tests/CTestTestSubdir/CTestConfig.cmake
+++ b/Tests/CTestTestSubdir/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestSubdir")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestTimeout/CTestConfig.cmake
b/Tests/CTestTestTimeout/CTestConfig.cmake
index 13114f1..faa91f0 100644
--- a/Tests/CTestTestTimeout/CTestConfig.cmake
+++ b/Tests/CTestTestTimeout/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestTimeout")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestUpload/CTestConfig.cmake
b/Tests/CTestTestUpload/CTestConfig.cmake
index a547088..95c79ff 100644
--- a/Tests/CTestTestUpload/CTestConfig.cmake
+++ b/Tests/CTestTestUpload/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestUpload")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set (CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestVerboseOutput/CTestConfig.cmake
b/Tests/CTestTestVerboseOutput/CTestConfig.cmake
index 4f96c79..faa91f0 100644
--- a/Tests/CTestTestVerboseOutput/CTestConfig.cmake
+++ b/Tests/CTestTestVerboseOutput/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestVerboseOutput")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestTestZeroTimeout/CTestConfig.cmake
b/Tests/CTestTestZeroTimeout/CTestConfig.cmake
index 6094864..faa91f0 100644
--- a/Tests/CTestTestZeroTimeout/CTestConfig.cmake
+++ b/Tests/CTestTestZeroTimeout/CTestConfig.cmake
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestZeroTimeout")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake
index 61aa13b..0f8ec8e 100644
--- a/Tests/CTestUpdateCommon.cmake
+++ b/Tests/CTestUpdateCommon.cmake
@@ -130,7 +130,6 @@ function(create_content dir)
# An example CTest project configuration file.
file(WRITE ${TOP}/${dir}/CTestConfig.cmake
"# CTest Configuration File
-set(CTEST_PROJECT_NAME TestProject)
set(CTEST_NIGHTLY_START_TIME \"21:00:00 EDT\")
")
diff --git a/Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
b/Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
deleted file mode 100644
index 58b11af..0000000
--- a/Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "TimeoutAfterMatch@CASE_NAME@")
diff --git a/Tests/RunCMake/RunCTest.cmake b/Tests/RunCMake/RunCTest.cmake
index 89e16ee..c2c31d1 100644
--- a/Tests/RunCMake/RunCTest.cmake
+++ b/Tests/RunCMake/RunCTest.cmake
@@ -3,8 +3,10 @@ include(RunCMake)
function(run_ctest CASE_NAME)
configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in
${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY)
- configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
- ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
+ if(EXISTS "${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in")
+ configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
+ ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
+ endif()
configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND}
diff --git a/Tests/RunCMake/WorkingDirectory/CTestConfig.cmake.in
b/Tests/RunCMake/WorkingDirectory/CTestConfig.cmake.in
deleted file mode 100644
index 0226230..0000000
--- a/Tests/RunCMake/WorkingDirectory/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTestWorkingDir.@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
b/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
index 2e59d99..cc9085f 100644
--- a/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
+++ b/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Experimental
Source directory: .*/Tests/RunCMake/ctest_build/BuildQuiet
Build directory: .*/Tests/RunCMake/ctest_build/BuildQuiet-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_build/BuildQuiet/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use Experimental tag: [0-9-]+
diff --git a/Tests/RunCMake/ctest_build/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_build/CTestConfig.cmake.in
deleted file mode 100644
index 097f82c..0000000
--- a/Tests/RunCMake/ctest_build/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestBuild@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_cmake_error/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_cmake_error/CTestConfig.cmake.in
deleted file mode 100644
index 1f679d5..0000000
--- a/Tests/RunCMake/ctest_cmake_error/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestCoverage@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
deleted file mode 100644
index 7e30ab9..0000000
--- a/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestConfigure@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
index 015644d..98f5a4c 100644
--- a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
+++ b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Experimental
Source directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet
Build directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_configure/ConfigureQuiet/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use Experimental tag: [0-9-]+
diff --git a/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
deleted file mode 100644
index 1f679d5..0000000
--- a/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestCoverage@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_disabled_test/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_disabled_test/CTestConfig.cmake.in
deleted file mode 100644
index c0d7e42..0000000
--- a/Tests/RunCMake/ctest_disabled_test/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_fixtures/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_fixtures/CTestConfig.cmake.in
deleted file mode 100644
index 9823562..0000000
--- a/Tests/RunCMake/ctest_fixtures/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTestFixtures.@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfig.cmake.in
index 1e1905b..5d83530 100644
--- a/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfig.cmake.in
+++ b/Tests/RunCMake/ctest_labels_for_subprojects/CTestConfig.cmake.in
@@ -1,2 +1 @@
-set(CTEST_PROJECT_NAME "CTestLabelsForSubprojects@CASE_NAME@")
@CTEST_EXTRA_CONFIG@
diff --git a/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in
index 6d4a718..fe6f6ce 100644
--- a/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in
+++ b/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in
@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestMemcheck@CASE_NAME@")
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http")
diff --git a/Tests/RunCMake/ctest_skipped_test/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_skipped_test/CTestConfig.cmake.in
deleted file mode 100644
index c0d7e42..0000000
--- a/Tests/RunCMake/ctest_skipped_test/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_start/AppendDifferentModel-stdout.txt
b/Tests/RunCMake/ctest_start/AppendDifferentModel-stdout.txt
index bc9a4c8..78f36a1 100644
--- a/Tests/RunCMake/ctest_start/AppendDifferentModel-stdout.txt
+++ b/Tests/RunCMake/ctest_start/AppendDifferentModel-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Experimental
Source directory: .*/Tests/RunCMake/ctest_start/AppendDifferentModel
Build directory: .*/Tests/RunCMake/ctest_start/AppendDifferentModel-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/AppendDifferentModel/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use existing tag: 19551112-2204 - ContinuousTrack
diff --git a/Tests/RunCMake/ctest_start/AppendDifferentTrack-stdout.txt
b/Tests/RunCMake/ctest_start/AppendDifferentTrack-stdout.txt
index ab1c1f7..25085ef 100644
--- a/Tests/RunCMake/ctest_start/AppendDifferentTrack-stdout.txt
+++ b/Tests/RunCMake/ctest_start/AppendDifferentTrack-stdout.txt
@@ -2,7 +2,6 @@ Run dashboard with to-be-determined model
Source directory: .*/Tests/RunCMake/ctest_start/AppendDifferentTrack
Build directory: .*/Tests/RunCMake/ctest_start/AppendDifferentTrack-build
Track: ExperimentalDifferent
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/AppendDifferentTrack/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use existing tag: 19551112-2204 - ExperimentalDifferent
diff --git a/Tests/RunCMake/ctest_start/AppendNoMatchingTrack-stdout.txt
b/Tests/RunCMake/ctest_start/AppendNoMatchingTrack-stdout.txt
index 55f2d8e..5780629 100644
--- a/Tests/RunCMake/ctest_start/AppendNoMatchingTrack-stdout.txt
+++ b/Tests/RunCMake/ctest_start/AppendNoMatchingTrack-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Continuous
Source directory: .*/Tests/RunCMake/ctest_start/AppendNoMatchingTrack
Build directory: .*/Tests/RunCMake/ctest_start/AppendNoMatchingTrack-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/AppendNoMatchingTrack/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use existing tag: 19551112-2204 - SomeWeirdTrackName
diff --git a/Tests/RunCMake/ctest_start/AppendNoModel-stdout.txt
b/Tests/RunCMake/ctest_start/AppendNoModel-stdout.txt
index f909a44..bcd0125 100644
--- a/Tests/RunCMake/ctest_start/AppendNoModel-stdout.txt
+++ b/Tests/RunCMake/ctest_start/AppendNoModel-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with to-be-determined model
Source directory: .*/Tests/RunCMake/ctest_start/AppendNoModel
Build directory: .*/Tests/RunCMake/ctest_start/AppendNoModel-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/AppendNoModel/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use existing tag: 19551112-2204 - ContinuousTrack
diff --git a/Tests/RunCMake/ctest_start/AppendOldContinuous-stdout.txt
b/Tests/RunCMake/ctest_start/AppendOldContinuous-stdout.txt
index 0660f5d..e58cd9c 100644
--- a/Tests/RunCMake/ctest_start/AppendOldContinuous-stdout.txt
+++ b/Tests/RunCMake/ctest_start/AppendOldContinuous-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Continuous
Source directory: .*/Tests/RunCMake/ctest_start/AppendOldContinuous
Build directory: .*/Tests/RunCMake/ctest_start/AppendOldContinuous-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/AppendOldContinuous/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use existing tag: 19551112-2204 - ContinuousTrack
diff --git a/Tests/RunCMake/ctest_start/AppendOldNoModel-stdout.txt
b/Tests/RunCMake/ctest_start/AppendOldNoModel-stdout.txt
index 0bdf9e4..47331e6 100644
--- a/Tests/RunCMake/ctest_start/AppendOldNoModel-stdout.txt
+++ b/Tests/RunCMake/ctest_start/AppendOldNoModel-stdout.txt
@@ -1,6 +1,5 @@
Run dashboard with to-be-determined model
Source directory: .*/Tests/RunCMake/ctest_start/AppendOldNoModel
Build directory: .*/Tests/RunCMake/ctest_start/AppendOldNoModel-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/AppendOldNoModel/CTestConfig.cmake
Site: test-site
Build name: test-build-name
diff --git a/Tests/RunCMake/ctest_start/AppendSameModel-stdout.txt
b/Tests/RunCMake/ctest_start/AppendSameModel-stdout.txt
index 4f43626..3abd51e 100644
--- a/Tests/RunCMake/ctest_start/AppendSameModel-stdout.txt
+++ b/Tests/RunCMake/ctest_start/AppendSameModel-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Continuous
Source directory: .*/Tests/RunCMake/ctest_start/AppendSameModel
Build directory: .*/Tests/RunCMake/ctest_start/AppendSameModel-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/AppendSameModel/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use existing tag: 19551112-2204 - ContinuousTrack
diff --git a/Tests/RunCMake/ctest_start/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_start/CTestConfig.cmake.in
deleted file mode 100644
index e75d14f..0000000
--- a/Tests/RunCMake/ctest_start/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestStart@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_start/ConfigInBuild-stdout.txt
b/Tests/RunCMake/ctest_start/ConfigInBuild-stdout.txt
index 7e94b8a..f4a0ba3 100644
--- a/Tests/RunCMake/ctest_start/ConfigInBuild-stdout.txt
+++ b/Tests/RunCMake/ctest_start/ConfigInBuild-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Experimental
Source directory: .*/Tests/RunCMake/ctest_start/ConfigInBuild
Build directory: .*/Tests/RunCMake/ctest_start/ConfigInBuild-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/ConfigInBuild-build/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use Experimental tag: [0-9-]+
diff --git a/Tests/RunCMake/ctest_start/ConfigInSource-stdout.txt
b/Tests/RunCMake/ctest_start/ConfigInSource-stdout.txt
index c390372..5f98b4e 100644
--- a/Tests/RunCMake/ctest_start/ConfigInSource-stdout.txt
+++ b/Tests/RunCMake/ctest_start/ConfigInSource-stdout.txt
@@ -1,7 +1,6 @@
Run dashboard with model Experimental
Source directory: .*/Tests/RunCMake/ctest_start/ConfigInSource
Build directory: .*/Tests/RunCMake/ctest_start/ConfigInSource-build
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/ConfigInSource/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use Experimental tag: [0-9-]+
diff --git a/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt
b/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt
index 4a6f1e9..20a29be 100644
--- a/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt
+++ b/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt
@@ -2,7 +2,6 @@ Run dashboard with model Experimental
Source directory: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack
Build directory: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-build
Track: ExperimentalDifferent
- Reading ctest configuration file:
.*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack/CTestConfig.cmake
Site: test-site
Build name: test-build-name
Use ExperimentalDifferent tag: [0-9-]+
diff --git a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
index 9b57b1b..905ad00 100644
--- a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
@@ -48,8 +48,6 @@ function(run_ConfigInBuild)
set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
- configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
- ${RunCMake_BINARY_DIR}/ConfigInBuild-build/CTestConfig.cmake
@ONLY)
run_ctest_start(ConfigInBuild Experimental)
endfunction()
run_ConfigInBuild()
diff --git a/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
index 378a85a..140e4be 100644
--- a/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
+++ b/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestSubmit@CASE_NAME@")
# Intentionally leave out other upload-related CTestConfig.cmake settings
# so that any ctest_submit calls fail with an error message.
diff --git a/Tests/RunCMake/ctest_test/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_test/CTestConfig.cmake.in
deleted file mode 100644
index 9004419..0000000
--- a/Tests/RunCMake/ctest_test/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTest@CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
b/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
deleted file mode 100644
index 52665a8..0000000
--- a/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestUpload@CASE_NAME@")
diff --git a/Tests/Tutorial/Step7/CTestConfig.cmake
b/Tests/Tutorial/Step7/CTestConfig.cmake
deleted file mode 100644
index d8f5c44..0000000
--- a/Tests/Tutorial/Step7/CTestConfig.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set (CTEST_PROJECT_NAME "Tutorial")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15ac4aae0e3199fe8ac7f46cf4eb064cbeb1660d
commit 15ac4aae0e3199fe8ac7f46cf4eb064cbeb1660d
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Tue Nov 20 21:19:45 2018 +0100
Commit: Regina Pfeifer <reg...@mailbox.org>
CommitDate: Tue Nov 20 21:23:59 2018 +0100
Remove warning when no CTestConfig.cmake file exists
Some CTestConfig.cmake files used to set CTEST_PROJECT_NAME only.
Since this variable is no longer used, it is more likely that the
whole file is no longer provided by projects.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index c2b6575..56c71c2 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -649,16 +649,6 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand*
command)
command->SetError(m);
return false;
}
- } else {
- cmCTestOptionalLog(this, WARNING,
- "Cannot locate CTest configuration: in BuildDirectory: "
- << bld_dir_fname << std::endl,
- command->ShouldBeQuiet());
- cmCTestOptionalLog(
- this, WARNING,
- "Cannot locate CTest configuration: in SourceDirectory: "
- << src_dir_fname << std::endl,
- command->ShouldBeQuiet());
}
this->SetCTestConfigurationFromCMakeVariable(mf, "NightlyStartTime",
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3125c47d27d4d57cb31e10c4bd658fc1e352299d
commit 3125c47d27d4d57cb31e10c4bd658fc1e352299d
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Tue Nov 20 13:50:19 2018 +0100
Commit: Regina Pfeifer <reg...@mailbox.org>
CommitDate: Tue Nov 20 21:23:59 2018 +0100
ctest_build: Do not require unnecessary [CTEST_]PROJECT_NAME value
Since commit v3.0.0-rc1~260^2~32 (ctest_build: Use "cmake --build"
to launch the native build tool, 2013-11-14) we no longer need to
use the project name in `ctest_build()`.
Fixes: #18612
diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst
index 55bb4a3..66e1844 100644
--- a/Help/command/ctest_build.rst
+++ b/Help/command/ctest_build.rst
@@ -50,9 +50,7 @@ The options are:
for an example.
``PROJECT_NAME <project-name>``
- Set the name of the project to build. This should correspond
- to the top-level call to the :command:`project` command.
- If not specified the ``CTEST_PROJECT_NAME`` variable will be checked.
+ Ignored. This was once used but is no longer needed.
``TARGET <target-name>``
Specify the name of a target to build. If not specified the
diff --git a/Source/CTest/cmCTestBuildCommand.cxx
b/Source/CTest/cmCTestBuildCommand.cxx
index ce27da1..65b4976 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -53,10 +53,6 @@ cmCTestGenericHandler*
cmCTestBuildCommand::InitializeHandler()
} else {
const char* cmakeGeneratorName =
this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
- const char* cmakeProjectName =
- (this->Values[ctb_PROJECT_NAME] && *this->Values[ctb_PROJECT_NAME])
- ? this->Values[ctb_PROJECT_NAME]
- : this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
// Build configuration is determined by: CONFIGURATION argument,
// or CTEST_BUILD_CONFIGURATION script variable, or
@@ -81,8 +77,7 @@ cmCTestGenericHandler*
cmCTestBuildCommand::InitializeHandler()
? this->Values[ctb_TARGET]
: this->Makefile->GetDefinition("CTEST_BUILD_TARGET");
- if (cmakeGeneratorName && *cmakeGeneratorName && cmakeProjectName &&
- *cmakeProjectName) {
+ if (cmakeGeneratorName && *cmakeGeneratorName) {
if (!cmakeBuildConfiguration) {
cmakeBuildConfiguration = "Release";
}
@@ -132,14 +127,7 @@ cmCTestGenericHandler*
cmCTestBuildCommand::InitializeHandler()
/* clang-format off */
ostr << "has no project to build. If this is a "
"\"built with CMake\" project, verify that CTEST_CMAKE_GENERATOR "
- "and CTEST_PROJECT_NAME are set."
- "\n"
- "CTEST_PROJECT_NAME is usually set in CTestConfig.cmake. Verify "
- "that CTestConfig.cmake exists, or CTEST_PROJECT_NAME "
- "is set in the script, or PROJECT_NAME is passed as an argument "
- "to ctest_build."
- "\n"
- "Alternatively, set CTEST_BUILD_COMMAND to build the project "
+ "is set. Otherwise, set CTEST_BUILD_COMMAND to build the project "
"with a custom command line.";
/* clang-format on */
this->SetError(ostr.str());
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36bbd07a765820ddbcaef3db4e2a78d95910f5e1
commit 36bbd07a765820ddbcaef3db4e2a78d95910f5e1
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Tue Nov 20 16:29:08 2018 +0100
Commit: Regina Pfeifer <reg...@mailbox.org>
CommitDate: Tue Nov 20 21:23:59 2018 +0100
CDashUpload: Use the query part of the submit url as field
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx
b/Source/CTest/cmCTestSubmitCommand.cxx
index 34adb4a..60029ab 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -23,8 +23,6 @@ cmCTestGenericHandler*
cmCTestSubmitCommand::InitializeHandler()
const char* ctestTriggerSite =
this->Makefile->GetDefinition("CTEST_TRIGGER_SITE");
bool ctestDropSiteCDash = this->Makefile->IsOn("CTEST_DROP_SITE_CDASH");
- const char* ctestProjectName =
- this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
if (!ctestDropMethod) {
ctestDropMethod = "http";
}
@@ -37,8 +35,6 @@ cmCTestGenericHandler*
cmCTestSubmitCommand::InitializeHandler()
// error: CDash requires CTEST_DROP_LOCATION definition
// in CTestConfig.cmake
}
- this->CTest->SetCTestConfiguration("ProjectName", ctestProjectName,
- this->Quiet);
this->CTest->SetCTestConfiguration("DropMethod", ctestDropMethod,
this->Quiet);
this->CTest->SetCTestConfiguration("DropSite", ctestDropSite, this->Quiet);
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index d57b55e..061c8ef 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1084,8 +1084,10 @@ int
cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
std::string dropMethod;
std::string url;
this->ConstructCDashURL(dropMethod, url);
+ std::string fields;
std::string::size_type pos = url.find('?');
if (pos != std::string::npos) {
+ fields = url.substr(pos + 1);
url = url.substr(0, pos);
}
if (!(dropMethod == "http" || dropMethod == "https")) {
@@ -1135,8 +1137,6 @@ int
cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
const char* subproject = cm->GetState()->GetGlobalProperty("SubProject");
// TODO: Encode values for a URL instead of trusting caller.
std::ostringstream str;
- str << "project="
- << curl.Escape(this->CTest->GetCTestConfiguration("ProjectName")) << "&";
if (subproject) {
str << "subproject=" << curl.Escape(subproject) << "&";
}
@@ -1154,7 +1154,10 @@ int
cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
<< "endtime=" << timeNow << "&"
<< "datafilesmd5[0]=" << md5sum << "&"
<< "type=" << curl.Escape(typeString);
- std::string fields = str.str();
+ if (!fields.empty()) {
+ fields += '&';
+ }
+ fields += str.str();
cmCTestOptionalLog(this->CTest, DEBUG,
"fields: " << fields << "\nurl:" << url
<< "\nfile: " << file << "\n",
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1dfe8cee619be2db2dcccfae5381376d336c6a3
commit e1dfe8cee619be2db2dcccfae5381376d336c6a3
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Tue Nov 20 15:44:17 2018 +0100
Commit: Regina Pfeifer <reg...@mailbox.org>
CommitDate: Tue Nov 20 21:23:59 2018 +0100
CTest: Don't require 'submit.php?' in submit location
Fixes: #18611
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index 98872a5..d57b55e 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1084,8 +1084,10 @@ int
cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
std::string dropMethod;
std::string url;
this->ConstructCDashURL(dropMethod, url);
- std::string::size_type pos = url.find("submit.php?");
- url = url.substr(0, pos + 10);
+ std::string::size_type pos = url.find('?');
+ if (pos != std::string::npos) {
+ url = url.substr(0, pos);
+ }
if (!(dropMethod == "http" || dropMethod == "https")) {
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Only http and https are supported for CDASH_UPLOAD\n");
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5f691be0b78a48e836dc42b97d000ba151c44d6
commit d5f691be0b78a48e836dc42b97d000ba151c44d6
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 20:16:39 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sun Nov 18 20:16:39 2018 +0000
FindLAPACK: Additional libraries for MKL+gfortran combination
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".
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 89a1430..7619664 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -96,6 +96,9 @@ if (NOT _libdir)
set(_libdir ENV LD_LIBRARY_PATH)
endif ()
endif ()
+
+list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
+
foreach(_library ${_list})
set(_combined_name ${_combined_name}_${_library})
@@ -179,6 +182,7 @@ if(BLAS_FOUND)
if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT WIN32)
set(LAPACK_mkl_LM "-lm")
+ set(LAPACK_mkl_LDL "-ldl")
endif ()
if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)
if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
@@ -240,7 +244,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
""
"${IT}"
"${_BLAS_LIBRARIES}"
- "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM}"
+ "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM};${LAPACK_mkl_LDL}"
)
endif ()
endforeach ()
@@ -248,6 +252,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
unset(LAPACK_mkl_ILP_MODE)
unset(LAPACK_mkl_SEARCH_SYMBOL)
unset(LAPACK_mkl_LM)
+ unset(LAPACK_mkl_LDL)
endif ()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b63265ea53dbd2e035a6b616ba0e82bfc0decc0
commit 8b63265ea53dbd2e035a6b616ba0e82bfc0decc0
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 20:00:14 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sun Nov 18 20:00:14 2018 +0000
FindLAPACK: Unify internal variables related to MKL
Auxiliary internal variables related to MKL are now consistently
prefixed with LAPACK_mkl_ and unset at the end of the MKL section.
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index ad1cd45..89a1430 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -178,7 +178,7 @@ if(BLAS_FOUND)
#intel lapack
if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT WIN32)
- set(LM "-lm")
+ set(LAPACK_mkl_LM "-lm")
endif ()
if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)
if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
@@ -188,9 +188,9 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
endif()
if (BLA_VENDOR MATCHES "_64ilp")
- set(BLAS_mkl_ILP_MODE "ilp64")
+ set(LAPACK_mkl_ILP_MODE "ilp64")
else ()
- set(BLAS_mkl_ILP_MODE "lp64")
+ set(LAPACK_mkl_ILP_MODE "lp64")
endif ()
set(LAPACK_SEARCH_LIBS "")
@@ -207,7 +207,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
list(APPEND LAPACK_SEARCH_LIBS
"mkl_intel_c")
list(APPEND LAPACK_SEARCH_LIBS
- "mkl_lapack95_${BLAS_mkl_ILP_MODE}")
+ "mkl_lapack95_${LAPACK_mkl_ILP_MODE}")
else()
set(LAPACK_mkl_SEARCH_SYMBOL "cheev")
set(_LIBRARIES LAPACK_LIBRARIES)
@@ -222,7 +222,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT ${_LIBRARIES})
check_lapack_libraries(
${_LIBRARIES}
- BLAS
+ LAPACK
${LAPACK_mkl_SEARCH_SYMBOL}
""
""
@@ -235,17 +235,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
if (NOT ${_LIBRARIES})
check_lapack_libraries(
${_LIBRARIES}
- BLAS
+ LAPACK
${LAPACK_mkl_SEARCH_SYMBOL}
""
"${IT}"
"${_BLAS_LIBRARIES}"
- "${CMAKE_THREAD_LIBS_INIT};${LM}"
+ "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM}"
)
endif ()
endforeach ()
- unset(BLAS_mkl_ILP_MODE)
+ unset(LAPACK_mkl_ILP_MODE)
+ unset(LAPACK_mkl_SEARCH_SYMBOL)
+ unset(LAPACK_mkl_LM)
endif ()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ede1715c1d4f35e806e3dabddd09c39eeed9a628
commit ede1715c1d4f35e806e3dabddd09c39eeed9a628
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 19:53:32 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sun Nov 18 19:56:24 2018 +0000
FindLAPACK: Remove MKL components already provided by MKL BLAS
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).
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index d8daef2..ad1cd45 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -216,9 +216,6 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
# old
list(APPEND LAPACK_SEARCH_LIBS
"mkl_lapack")
- # new >= 10.3
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_gf_${BLAS_mkl_ILP_MODE}")
endif()
# First try empty lapack libs
@@ -230,7 +227,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
""
""
"${_BLAS_LIBRARIES}"
- "${CMAKE_THREAD_LIBS_INIT};${LM}"
+ ""
)
endif ()
# Then try the search libs
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03879b11af0b2179d879358df3cce3c2b7acb047
commit 03879b11af0b2179d879358df3cce3c2b7acb047
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 19:48:23 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sun Nov 18 19:48:23 2018 +0000
FindLAPACK: Prioritize Intel MKL
As in FindBLAS, the Intel Math Kernel Library is now the preferred
LAPACK vendor. (The corresponding section of the code has been moved
upwards.)
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 62ff94c..d8daef2 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -175,6 +175,83 @@ if(BLAS_FOUND)
endif()
endif ()
+#intel lapack
+if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
+ if (NOT WIN32)
+ set(LM "-lm")
+ endif ()
+ if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)
+ if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
+ find_PACKAGE(Threads)
+ else()
+ find_package(Threads REQUIRED)
+ endif()
+
+ if (BLA_VENDOR MATCHES "_64ilp")
+ set(BLAS_mkl_ILP_MODE "ilp64")
+ else ()
+ set(BLAS_mkl_ILP_MODE "lp64")
+ endif ()
+
+ set(LAPACK_SEARCH_LIBS "")
+
+ if (BLA_F95)
+ set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95")
+ set(_LIBRARIES LAPACK95_LIBRARIES)
+ set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
+
+ # old
+ list(APPEND LAPACK_SEARCH_LIBS
+ "mkl_lapack95")
+ # new >= 10.3
+ list(APPEND LAPACK_SEARCH_LIBS
+ "mkl_intel_c")
+ list(APPEND LAPACK_SEARCH_LIBS
+ "mkl_lapack95_${BLAS_mkl_ILP_MODE}")
+ else()
+ set(LAPACK_mkl_SEARCH_SYMBOL "cheev")
+ set(_LIBRARIES LAPACK_LIBRARIES)
+ set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})
+
+ # old
+ list(APPEND LAPACK_SEARCH_LIBS
+ "mkl_lapack")
+ # new >= 10.3
+ list(APPEND LAPACK_SEARCH_LIBS
+ "mkl_gf_${BLAS_mkl_ILP_MODE}")
+ endif()
+
+ # First try empty lapack libs
+ if (NOT ${_LIBRARIES})
+ check_lapack_libraries(
+ ${_LIBRARIES}
+ BLAS
+ ${LAPACK_mkl_SEARCH_SYMBOL}
+ ""
+ ""
+ "${_BLAS_LIBRARIES}"
+ "${CMAKE_THREAD_LIBS_INIT};${LM}"
+ )
+ endif ()
+ # Then try the search libs
+ foreach (IT ${LAPACK_SEARCH_LIBS})
+ if (NOT ${_LIBRARIES})
+ check_lapack_libraries(
+ ${_LIBRARIES}
+ BLAS
+ ${LAPACK_mkl_SEARCH_SYMBOL}
+ ""
+ "${IT}"
+ "${_BLAS_LIBRARIES}"
+ "${CMAKE_THREAD_LIBS_INIT};${LM}"
+ )
+ endif ()
+ endforeach ()
+
+ unset(BLAS_mkl_ILP_MODE)
+ endif ()
+endif()
+
if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
if(NOT LAPACK_LIBRARIES)
check_lapack_libraries(
@@ -267,82 +344,7 @@ if (BLA_VENDOR STREQUAL "Generic" OR
)
endif ()
endif ()
-#intel lapack
-if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
- if (NOT WIN32)
- set(LM "-lm")
- endif ()
- if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)
- if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
- find_PACKAGE(Threads)
- else()
- find_package(Threads REQUIRED)
- endif()
-
- if (BLA_VENDOR MATCHES "_64ilp")
- set(BLAS_mkl_ILP_MODE "ilp64")
- else ()
- set(BLAS_mkl_ILP_MODE "lp64")
- endif ()
-
- set(LAPACK_SEARCH_LIBS "")
-
- if (BLA_F95)
- set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95")
- set(_LIBRARIES LAPACK95_LIBRARIES)
- set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
-
- # old
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_lapack95")
- # new >= 10.3
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_intel_c")
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_lapack95_${BLAS_mkl_ILP_MODE}")
- else()
- set(LAPACK_mkl_SEARCH_SYMBOL "cheev")
- set(_LIBRARIES LAPACK_LIBRARIES)
- set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})
- # old
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_lapack")
- # new >= 10.3
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_gf_${BLAS_mkl_ILP_MODE}")
- endif()
-
- # First try empty lapack libs
- if (NOT ${_LIBRARIES})
- check_lapack_libraries(
- ${_LIBRARIES}
- BLAS
- ${LAPACK_mkl_SEARCH_SYMBOL}
- ""
- ""
- "${_BLAS_LIBRARIES}"
- "${CMAKE_THREAD_LIBS_INIT};${LM}"
- )
- endif ()
- # Then try the search libs
- foreach (IT ${LAPACK_SEARCH_LIBS})
- if (NOT ${_LIBRARIES})
- check_lapack_libraries(
- ${_LIBRARIES}
- BLAS
- ${LAPACK_mkl_SEARCH_SYMBOL}
- ""
- "${IT}"
- "${_BLAS_LIBRARIES}"
- "${CMAKE_THREAD_LIBS_INIT};${LM}"
- )
- endif ()
- endforeach ()
-
- unset(BLAS_mkl_ILP_MODE)
- endif ()
-endif()
else()
message(STATUS "LAPACK requires BLAS")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4edf7b5d2b2ba8eccfa0230dad98d0815a17d5d
commit b4edf7b5d2b2ba8eccfa0230dad98d0815a17d5d
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 16:14:39 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sun Nov 18 17:00:37 2018 +0000
FindBLAS: Support 32bit Intel MKL 10.3+
The module FindBLAS now correctly finds Intel MKL distributions that do
not have the (long deprecated) library "libguide", but use "libiomp5"
instead.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index d113579..c286a4d 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -285,8 +285,13 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
endforeach()
else ()
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
+ # old version
list(APPEND BLAS_SEARCH_LIBS
"mkl_blas95 mkl_${BLAS_mkl_INTFACE}
mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")
+
+ # mkl >= 10.3
+ list(APPEND BLAS_SEARCH_LIBS
+ "mkl_blas95 mkl_${BLAS_mkl_INTFACE}
mkl_${BLAS_mkl_THREADING}_thread mkl_core ${BLAS_mkl_OMP}")
endif ()
if (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR STREQUAL
"All")
# old version
@@ -341,11 +346,15 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
endforeach()
else ()
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
+ # old version
list(APPEND BLAS_SEARCH_LIBS
"mkl_${BLAS_mkl_INTFACE} mkl_${BLAS_mkl_THREADING}_thread
mkl_core guide")
+
+ # mkl >= 10.3
+ list(APPEND BLAS_SEARCH_LIBS
+ "mkl_${BLAS_mkl_INTFACE} mkl_${BLAS_mkl_THREADING}_thread
mkl_core ${BLAS_mkl_OMP}")
endif ()
if (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR STREQUAL
"All")
-
# old version
list(APPEND BLAS_SEARCH_LIBS
"mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE}
mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc149a72f7e9128c0ad54014d745500fd31eea36
commit fc149a72f7e9128c0ad54014d745500fd31eea36
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 15:05:28 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sun Nov 18 16:59:03 2018 +0000
FindBLAS: Support combination of gfortran and Intel MKL
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.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 369bf06..d113579 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -126,6 +126,8 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name
_flags _list _thread)
endif ()
endif ()
+ list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
+
foreach(_library ${_list})
set(_combined_name ${_combined_name}_${_library})
@@ -170,6 +172,8 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name
_flags _list _thread)
if(_libraries_work)
if("${_list}" STREQUAL "")
set(${LIBRARIES} "${LIBRARIES}-PLACEHOLDER-FOR-EMPTY-LIBRARIES")
+ else()
+ set(${LIBRARIES} ${${LIBRARIES}} ${_thread}) # for static link
endif()
else()
set(${LIBRARIES} FALSE)
@@ -205,21 +209,34 @@ endif ()
#BLAS in intel mkl 10+ library? (em64t 64bit)
if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT BLAS_LIBRARIES)
+
+ # System-specific settings
if (WIN32)
if (BLA_STATIC)
set(BLAS_mkl_DLL_SUFFIX "")
else()
set(BLAS_mkl_DLL_SUFFIX "_dll")
endif()
+ else()
+ if(CMAKE_Fortran_COMPILER_LOADED AND CMAKE_Fortran_COMPILER_ID STREQUAL
"GNU")
+ set(BLAS_mkl_INTFACE "gf")
+ set(BLAS_mkl_THREADING "gnu")
+ set(BLAS_mkl_OMP "gomp")
+ else()
+ set(BLAS_mkl_INTFACE "intel")
+ set(BLAS_mkl_THREADING "intel")
+ set(BLAS_mkl_OMP "iomp5")
+ endif()
+ set(BLAS_mkl_LM "-lm")
+ set(BLAS_mkl_LDL "-ldl")
endif()
+
if (BLA_VENDOR MATCHES "_64ilp")
set(BLAS_mkl_ILP_MODE "ilp64")
else ()
set(BLAS_mkl_ILP_MODE "lp64")
endif ()
- if (NOT WIN32)
- set(LM "-lm")
- endif ()
+
if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)
if(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
find_package(Threads)
@@ -269,25 +286,20 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
else ()
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
list(APPEND BLAS_SEARCH_LIBS
- "mkl_blas95 mkl_intel mkl_intel_thread mkl_core guide")
+ "mkl_blas95 mkl_${BLAS_mkl_INTFACE}
mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")
endif ()
if (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR STREQUAL
"All")
# old version
list(APPEND BLAS_SEARCH_LIBS
- "mkl_blas95 mkl_intel_${BLAS_mkl_ILP_MODE} mkl_intel_thread
mkl_core guide")
+ "mkl_blas95 mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE}
mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")
# mkl >= 10.3
- if (CMAKE_C_COMPILER MATCHES ".+gcc")
- list(APPEND BLAS_SEARCH_LIBS
- "mkl_blas95_${BLAS_mkl_ILP_MODE}
mkl_intel_${BLAS_mkl_ILP_MODE} mkl_gnu_thread mkl_core gomp")
- else ()
- list(APPEND BLAS_SEARCH_LIBS
- "mkl_blas95_${BLAS_mkl_ILP_MODE}
mkl_intel_${BLAS_mkl_ILP_MODE} mkl_intel_thread mkl_core iomp5")
- endif ()
+ list(APPEND BLAS_SEARCH_LIBS
+ "mkl_blas95_${BLAS_mkl_ILP_MODE}
mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_${BLAS_mkl_THREADING}_thread
mkl_core ${BLAS_mkl_OMP}")
endif ()
if (BLA_VENDOR MATCHES "^Intel10_64i?lp_seq$" OR BLA_VENDOR STREQUAL
"All")
list(APPEND BLAS_SEARCH_LIBS
- "mkl_blas95_${BLAS_mkl_ILP_MODE} mkl_intel_${BLAS_mkl_ILP_MODE}
mkl_sequential mkl_core")
+ "mkl_blas95_${BLAS_mkl_ILP_MODE}
mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_sequential mkl_core")
endif ()
endif ()
else ()
@@ -330,26 +342,21 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
else ()
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
list(APPEND BLAS_SEARCH_LIBS
- "mkl_intel mkl_intel_thread mkl_core guide")
+ "mkl_${BLAS_mkl_INTFACE} mkl_${BLAS_mkl_THREADING}_thread
mkl_core guide")
endif ()
if (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR STREQUAL
"All")
# old version
list(APPEND BLAS_SEARCH_LIBS
- "mkl_intel_${BLAS_mkl_ILP_MODE} mkl_intel_thread mkl_core guide")
+ "mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE}
mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")
# mkl >= 10.3
- if (CMAKE_C_COMPILER MATCHES ".+gcc")
- list(APPEND BLAS_SEARCH_LIBS
- "mkl_intel_${BLAS_mkl_ILP_MODE} mkl_gnu_thread mkl_core gomp")
- else ()
- list(APPEND BLAS_SEARCH_LIBS
- "mkl_intel_${BLAS_mkl_ILP_MODE} mkl_intel_thread mkl_core
iomp5")
- endif ()
+ list(APPEND BLAS_SEARCH_LIBS
+ "mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE}
mkl_${BLAS_mkl_THREADING}_thread mkl_core ${BLAS_mkl_OMP}")
endif ()
if (BLA_VENDOR MATCHES "^Intel10_64i?lp_seq$" OR BLA_VENDOR STREQUAL
"All")
list(APPEND BLAS_SEARCH_LIBS
- "mkl_intel_${BLAS_mkl_ILP_MODE} mkl_sequential mkl_core")
+ "mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_sequential
mkl_core")
endif ()
#older vesions of intel mkl libs
@@ -373,13 +380,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
${BLAS_mkl_SEARCH_SYMBOL}
""
"${SEARCH_LIBS}"
- "${CMAKE_THREAD_LIBS_INIT};${LM}"
+ "${CMAKE_THREAD_LIBS_INIT};${BLAS_mkl_LM};${BLAS_mkl_LDL}"
)
endif ()
endforeach ()
endif ()
unset(BLAS_mkl_ILP_MODE)
+ unset(BLAS_mkl_INTFACE)
+ unset(BLAS_mkl_THREADING)
+ unset(BLAS_mkl_OMP)
+ unset(BLAS_mkl_DLL_SUFFIX)
+ unset(BLAS_mkl_LM)
+ unset(BLAS_mkl_LDL)
endif ()
endif ()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0d52f55f155ac3f3e2bafa072a4e0d7f1431d76
commit f0d52f55f155ac3f3e2bafa072a4e0d7f1431d76
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Sun Nov 18 14:52:13 2018 +0000
Commit: Jakub Benda <jacob.be...@gmail.com>
CommitDate: Sun Nov 18 14:52:13 2018 +0000
FindBLAS: Consolidate duplicated code related to MKL on Windows
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.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index d150826..369bf06 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -205,6 +205,13 @@ endif ()
#BLAS in intel mkl 10+ library? (em64t 64bit)
if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT BLAS_LIBRARIES)
+ if (WIN32)
+ if (BLA_STATIC)
+ set(BLAS_mkl_DLL_SUFFIX "")
+ else()
+ set(BLAS_mkl_DLL_SUFFIX "_dll")
+ endif()
+ endif()
if (BLA_VENDOR MATCHES "_64ilp")
set(BLAS_mkl_ILP_MODE "ilp64")
else ()
@@ -226,12 +233,6 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
set(BLAS_mkl_SEARCH_SYMBOL sgemm_f95)
set(_LIBRARIES BLAS95_LIBRARIES)
if (WIN32)
- if (BLA_STATIC)
- set(BLAS_mkl_DLL_SUFFIX "")
- else()
- set(BLAS_mkl_DLL_SUFFIX "_dll")
- endif()
-
# Find the main file (32-bit or 64-bit)
set(BLAS_SEARCH_LIBS_WIN_MAIN "")
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
@@ -293,12 +294,6 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
set(BLAS_mkl_SEARCH_SYMBOL sgemm)
set(_LIBRARIES BLAS_LIBRARIES)
if (WIN32)
- if (BLA_STATIC)
- set(BLAS_mkl_DLL_SUFFIX "")
- else()
- set(BLAS_mkl_DLL_SUFFIX "_dll")
- endif()
-
# Find the main file (32-bit or 64-bit)
set(BLAS_SEARCH_LIBS_WIN_MAIN "")
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
-----------------------------------------------------------------------
Summary of changes:
Help/command/ctest_build.rst | 4 +-
Help/prop_tgt/AUTOGEN_ORIGIN_DEPENDS.rst | 36 +++--
Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst | 25 ++--
Help/variable/CMAKE_GLOBAL_AUTOGEN_TARGET.rst | 8 ++
Modules/CTest.cmake | 1 -
Modules/FindBLAS.cmake | 107 ++++++++------
Modules/FindBoost.cmake | 9 +-
Modules/FindDoxygen.cmake | 19 ++-
Modules/FindLAPACK.cmake | 156 +++++++++++----------
Source/CTest/cmCTestBuildCommand.cxx | 16 +--
Source/CTest/cmCTestSubmitCommand.cxx | 4 -
Source/CTest/cmCTestSubmitHandler.cxx | 15 +-
Source/cmCTest.cxx | 10 --
Source/cmGlobalVisualStudio14Generator.cxx | 38 ++---
.../CTestBuildCommandProjectInSubdir.cmake.in | 1 -
Tests/CTestConfig/script.cmake.in | 1 -
Tests/CTestCoverageCollectGCOV/test.cmake.in | 1 -
Tests/CTestTestBadExe/CTestConfig.cmake | 1 -
Tests/CTestTestBadGenerator/CTestConfig.cmake | 1 -
Tests/CTestTestCostSerial/CTestConfig.cmake | 1 -
Tests/CTestTestCrash/CTestConfig.cmake | 1 -
Tests/CTestTestCycle/CTestConfig.cmake | 1 -
Tests/CTestTestDepends/CTestConfig.cmake | 1 -
Tests/CTestTestFailure/CTestConfig.cmake | 1 -
Tests/CTestTestFdSetSize/CTestConfig.cmake | 1 -
.../CTestConfig.cmake | 1 -
.../CTestConfig.cmake | 1 -
.../launcher_linker_test_project/CTestConfig.cmake | 1 -
Tests/CTestTestParallel/CTestConfig.cmake | 1 -
Tests/CTestTestResourceLock/CTestConfig.cmake | 1 -
Tests/CTestTestScheduler/CTestConfig.cmake | 1 -
Tests/CTestTestSkipReturnCode/CTestConfig.cmake | 1 -
Tests/CTestTestStopTime/CTestConfig.cmake | 1 -
Tests/CTestTestSubdir/CTestConfig.cmake | 1 -
Tests/CTestTestTimeout/CTestConfig.cmake | 1 -
Tests/CTestTestUpload/CTestConfig.cmake | 1 -
Tests/CTestTestVerboseOutput/CTestConfig.cmake | 1 -
Tests/CTestTestZeroTimeout/CTestConfig.cmake | 1 -
Tests/CTestUpdateCommon.cmake | 1 -
.../CTestTimeoutAfterMatch/CTestConfig.cmake.in | 1 -
.../NoCXX-stderr.txt} | 0
Tests/RunCMake/FindBoost/NoCXX.cmake | 1 +
Tests/RunCMake/FindBoost/RunCMakeTest.cmake | 1 +
Tests/RunCMake/RunCTest.cmake | 8 +-
.../RunCMake/WorkingDirectory/CTestConfig.cmake.in | 1 -
Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt | 1 -
Tests/RunCMake/ctest_build/CTestConfig.cmake.in | 1 -
.../ctest_cmake_error/CTestConfig.cmake.in | 1 -
.../RunCMake/ctest_configure/CTestConfig.cmake.in | 1 -
.../ctest_configure/ConfigureQuiet-stdout.txt | 1 -
Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in | 1 -
.../ctest_disabled_test/CTestConfig.cmake.in | 1 -
Tests/RunCMake/ctest_fixtures/CTestConfig.cmake.in | 1 -
.../CTestConfig.cmake.in | 1 -
Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in | 1 -
.../ctest_skipped_test/CTestConfig.cmake.in | 1 -
.../ctest_start/AppendDifferentModel-stdout.txt | 1 -
.../ctest_start/AppendDifferentTrack-stdout.txt | 1 -
.../ctest_start/AppendNoMatchingTrack-stdout.txt | 1 -
.../RunCMake/ctest_start/AppendNoModel-stdout.txt | 1 -
.../ctest_start/AppendOldContinuous-stdout.txt | 1 -
.../ctest_start/AppendOldNoModel-stdout.txt | 1 -
.../ctest_start/AppendSameModel-stdout.txt | 1 -
Tests/RunCMake/ctest_start/CTestConfig.cmake.in | 1 -
.../RunCMake/ctest_start/ConfigInBuild-stdout.txt | 1 -
.../RunCMake/ctest_start/ConfigInSource-stdout.txt | 1 -
.../ctest_start/NoAppendDifferentTrack-stdout.txt | 1 -
Tests/RunCMake/ctest_start/RunCMakeTest.cmake | 2 -
Tests/RunCMake/ctest_submit/CTestConfig.cmake.in | 1 -
Tests/RunCMake/ctest_test/CTestConfig.cmake.in | 1 -
Tests/RunCMake/ctest_upload/CTestConfig.cmake.in | 1 -
Tests/Tutorial/Step7/CTestConfig.cmake | 1 -
72 files changed, 245 insertions(+), 268 deletions(-)
delete mode 100644 Tests/CTestTestFdSetSize/CTestConfig.cmake
delete mode 100644 Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in
copy Tests/RunCMake/{target_link_options/LINK_OPTIONS-shared-result.txt =>
FindBoost/NoCXX-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/FindBoost/NoCXX.cmake
delete mode 100644 Tests/RunCMake/WorkingDirectory/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_build/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_cmake_error/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_disabled_test/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_fixtures/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_skipped_test/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_start/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_test/CTestConfig.cmake.in
delete mode 100644 Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
delete mode 100644 Tests/Tutorial/Step7/CTestConfig.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
