[Cmake-commits] CMake branch, next, updated. v3.2.2-1944-g7a57762
Brad King
brad.king at kitware.com
Mon Apr 20 10:44:59 EDT 2015
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, next has been updated
via 7a57762cbb03b41a7f9eaf3215a39e36c19c65c9 (commit)
via 28429270194c42973bbec6bd0e5aeae061a8925c (commit)
from fce1705922137efa9bf3ab5b6dc68ee5c1420cf8 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a57762cbb03b41a7f9eaf3215a39e36c19c65c9
commit 7a57762cbb03b41a7f9eaf3215a39e36c19c65c9
Merge: fce1705 2842927
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 10:44:58 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 10:44:58 2015 -0400
Merge topic 'ExternalProject-test-refactor' into next
28429270 Tests: Delay RunCMake.ExternalProject case checks
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28429270194c42973bbec6bd0e5aeae061a8925c
commit 28429270194c42973bbec6bd0e5aeae061a8925c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 10:24:50 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 20 10:27:19 2015 -0400
Tests: Delay RunCMake.ExternalProject case checks
Use RunCMake "-check.cmake" scripts to check the generated initial cache
file content so that the full generation process is completed.
diff --git a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS-check.cmake b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS-check.cmake
new file mode 100644
index 0000000..c1e4204
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS-check.cmake
@@ -0,0 +1,17 @@
+set(_cache_file "${RunCMake_TEST_BINARY_DIR}/tmp/FOO-cache.cmake")
+
+if(NOT EXISTS "${_cache_file}")
+ set(RunCMake_TEST_FAILED "Initial cache not created")
+ return()
+endif()
+
+file(READ "${_cache_file}" _cache)
+
+if(NOT "${_cache}" MATCHES "set\\(FOO \"BAR\".+\\)") # \(\)
+ set(RunCMake_TEST_FAILED "Cannot find FOO argument in cache")
+ return()
+endif()
+if(NOT "${CMAKE_MATCH_0}" MATCHES FORCE)
+ set(RunCMake_TEST_FAILED "Expected forced FOO argument")
+ return()
+endif()
diff --git a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS.cmake b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS.cmake
index bf9b12d..5e37eec 100644
--- a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS.cmake
+++ b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS.cmake
@@ -1,21 +1,5 @@
include(ExternalProject)
-set(_tmp_dir "${CMAKE_CURRENT_BINARY_DIR}/tmp")
-set(_cache_file "${_tmp_dir}/FOO-cache.cmake")
-
-ExternalProject_Add(FOO TMP_DIR "${_tmp_dir}"
+ExternalProject_Add(FOO TMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/tmp"
DOWNLOAD_COMMAND ""
CMAKE_CACHE_ARGS "-DFOO:STRING=BAR")
-
-if(NOT EXISTS "${_cache_file}")
- message(FATAL_ERROR "Initial cache not created")
-endif()
-
-file(READ "${_cache_file}" _cache)
-
-if(NOT "${_cache}" MATCHES "set\\(FOO \"BAR\".+\\)") # \(\)
- message(FATAL_ERROR "Cannot find FOO argument in cache")
-endif()
-if(NOT "${CMAKE_MATCH_0}" MATCHES FORCE)
- message(FATAL_ERROR "Expected forced FOO argument")
-endif()
diff --git a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS-check.cmake b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS-check.cmake
new file mode 100644
index 0000000..ec1cafb
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS-check.cmake
@@ -0,0 +1,17 @@
+set(_cache_file "${RunCMake_TEST_BINARY_DIR}/tmp/FOO-cache.cmake")
+
+if(NOT EXISTS "${_cache_file}")
+ set(RunCMake_TEST_FAILED "Initial cache not created")
+ return()
+endif()
+
+file(READ "${_cache_file}" _cache)
+
+if(NOT "${_cache}" MATCHES "set\\(FOO \"BAR\".+\\)") # \(\)
+ set(RunCMake_TEST_FAILED "Cannot find FOO argument in cache")
+ return()
+endif()
+if("${CMAKE_MATCH_0}" MATCHES FORCE)
+ set(RunCMake_TEST_FAILED "Expected not forced FOO argument")
+ return()
+endif()
diff --git a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake
index c216664..8e98470 100644
--- a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake
+++ b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake
@@ -1,21 +1,5 @@
include(ExternalProject)
-set(_tmp_dir "${CMAKE_CURRENT_BINARY_DIR}/tmp")
-set(_cache_file "${_tmp_dir}/FOO-cache.cmake")
-
-ExternalProject_Add(FOO TMP_DIR "${_tmp_dir}"
+ExternalProject_Add(FOO TMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/tmp"
DOWNLOAD_COMMAND ""
CMAKE_CACHE_DEFAULT_ARGS "-DFOO:STRING=BAR")
-
-if(NOT EXISTS "${_cache_file}")
- message(FATAL_ERROR "Initial cache not created")
-endif()
-
-file(READ "${_cache_file}" _cache)
-
-if(NOT "${_cache}" MATCHES "set\\(FOO \"BAR\".+\\)") # \(\)
- message(FATAL_ERROR "Cannot find FOO argument in cache")
-endif()
-if("${CMAKE_MATCH_0}" MATCHES FORCE)
- message(FATAL_ERROR "Expected not forced FOO argument")
-endif()
diff --git a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix-check.cmake b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix-check.cmake
new file mode 100644
index 0000000..2a07f27
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix-check.cmake
@@ -0,0 +1,26 @@
+set(_cache_file "${RunCMake_TEST_BINARY_DIR}/tmp/FOO-cache.cmake")
+
+if(NOT EXISTS "${_cache_file}")
+ set(RunCMake_TEST_FAILED "Initial cache not created")
+ return()
+endif()
+
+file(READ "${_cache_file}" _cache)
+
+if(NOT "${_cache}" MATCHES "set\\(FOO \"BAR\".+\\)") # \(\)
+ set(RunCMake_TEST_FAILED "Cannot find FOO argument in cache")
+ return()
+endif()
+if(NOT "${CMAKE_MATCH_0}" MATCHES FORCE)
+ set(RunCMake_TEST_FAILED "Expected forced FOO argument")
+ return()
+endif()
+
+if(NOT "${_cache}" MATCHES "set\\(BAR \"BAZ\".+\\)") # \(\)
+ set(RunCMake_TEST_FAILED "Cannot find BAR argument in cache")
+ return()
+endif()
+if("${CMAKE_MATCH_0}" MATCHES FORCE)
+ set(RunCMake_TEST_FAILED "Expected not forced BAR argument")
+ return()
+endif()
diff --git a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake
index 894e183..e7f26ae 100644
--- a/Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake
+++ b/Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake
@@ -1,29 +1,6 @@
include(ExternalProject)
-set(_tmp_dir "${CMAKE_CURRENT_BINARY_DIR}/tmp")
-set(_cache_file "${_tmp_dir}/FOO-cache.cmake")
-
-ExternalProject_Add(FOO TMP_DIR "${_tmp_dir}"
+ExternalProject_Add(FOO TMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/tmp"
DOWNLOAD_COMMAND ""
CMAKE_CACHE_ARGS "-DFOO:STRING=BAR"
CMAKE_CACHE_DEFAULT_ARGS "-DBAR:STRING=BAZ")
-
-if(NOT EXISTS "${_cache_file}")
- message(FATAL_ERROR "Initial cache not created")
-endif()
-
-file(READ "${_cache_file}" _cache)
-
-if(NOT "${_cache}" MATCHES "set\\(FOO \"BAR\".+\\)") # \(\)
- message(FATAL_ERROR "Cannot find FOO argument in cache")
-endif()
-if(NOT "${CMAKE_MATCH_0}" MATCHES FORCE)
- message(FATAL_ERROR "Expected forced FOO argument")
-endif()
-
-if(NOT "${_cache}" MATCHES "set\\(BAR \"BAZ\".+\\)") # \(\)
- message(FATAL_ERROR "Cannot find BAR argument in cache")
-endif()
-if("${CMAKE_MATCH_0}" MATCHES FORCE)
- message(FATAL_ERROR "Expected not forced BAR argument")
-endif()
-----------------------------------------------------------------------
Summary of changes:
.../ExternalProject/CMAKE_CACHE_ARGS-check.cmake | 17 +++++++++++++
.../ExternalProject/CMAKE_CACHE_ARGS.cmake | 18 +-------------
.../CMAKE_CACHE_DEFAULT_ARGS-check.cmake | 17 +++++++++++++
.../ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake | 18 +-------------
.../ExternalProject/CMAKE_CACHE_mix-check.cmake | 26 ++++++++++++++++++++
.../RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake | 25 +------------------
6 files changed, 63 insertions(+), 58 deletions(-)
create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS-check.cmake
create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS-check.cmake
create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix-check.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list