[Cmake-commits] CMake branch, next, updated. v3.3.1-2586-ge1fcdb6

[Domen Vrankar]

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  e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc (commit)
       via  674dc0b33566b433b6ac5751f965b7d0ff952e73 (commit)
      from  698baeca7519b75caa4958f187bc57e32da63aad (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=e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc
commit e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc
Merge: 698baec 674dc0b
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Aug 28 02:09:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 28 02:09:41 2015 -0400

    Merge topic 'cpack-config-generation-test' into next
    
    674dc0b3 CPack generator independent tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=674dc0b33566b433b6ac5751f965b7d0ff952e73
commit 674dc0b33566b433b6ac5751f965b7d0ff952e73
Author:     Roman Donchenko <dpb at corrigendum.ru>
AuthorDate: Fri Aug 28 08:07:52 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Aug 28 08:07:52 2015 +0200

    CPack generator independent tests
    
    CPackConfig.cmake file generation from CMake test suite.
    Currently it contains only a simple test without special
    characters in variable value.
    Test is not part of RunCMake/CPack as those tests are
    expected to be run for a specified generator.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c274d8f..2955db2 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -239,6 +239,7 @@ add_RunCMake_test(CommandLine)
 add_RunCMake_test(CommandLineTar)
 
 add_RunCMake_test(install)
+add_RunCMake_test(CPackConfig)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
 add_RunCMake_test(CTestCommandLine)
diff --git a/Tests/RunCMake/CPackConfig/CMakeLists.txt b/Tests/RunCMake/CPackConfig/CMakeLists.txt
new file mode 100644
index 0000000..9a9e7b4
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.3)
+
+project(${RunCMake_TEST})
+include(${RunCMake_TEST}.cmake)
+
+include(CPack)
diff --git a/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
new file mode 100644
index 0000000..6787eb8
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(Simple)
diff --git a/Tests/RunCMake/CPackConfig/Simple-check.cmake b/Tests/RunCMake/CPackConfig/Simple-check.cmake
new file mode 100644
index 0000000..6e0cf6f
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/Simple-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_variable(CPACK_FOO "bar baz;quux")
diff --git a/Tests/RunCMake/CPackConfig/Simple.cmake b/Tests/RunCMake/CPackConfig/Simple.cmake
new file mode 100644
index 0000000..c9f6541
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/Simple.cmake
@@ -0,0 +1 @@
+set(CPACK_FOO "bar baz;quux")
diff --git a/Tests/RunCMake/CPackConfig/check.cmake b/Tests/RunCMake/CPackConfig/check.cmake
new file mode 100644
index 0000000..2fc9f11
--- /dev/null
+++ b/Tests/RunCMake/CPackConfig/check.cmake
@@ -0,0 +1,7 @@
+function(test_variable NAME EXPECTED_VALUE)
+  if(NOT "${${NAME}}" STREQUAL "${EXPECTED_VALUE}")
+    message(FATAL_ERROR "${NAME}: variable mismatch; expected [${EXPECTED_VALUE}] actual [${${NAME}}]")
+  endif()
+endfunction()
+
+include(${RunCMake_TEST_BINARY_DIR}/CPackConfig.cmake)

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                          |    1 +
 Tests/RunCMake/{CMP0064 => CPackConfig}/CMakeLists.txt |    5 ++++-
 Tests/RunCMake/CPackConfig/RunCMakeTest.cmake          |    3 +++
 Tests/RunCMake/CPackConfig/Simple-check.cmake          |    3 +++
 Tests/RunCMake/CPackConfig/Simple.cmake                |    1 +
 Tests/RunCMake/CPackConfig/check.cmake                 |    7 +++++++
 6 files changed, 19 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{CMP0064 => CPackConfig}/CMakeLists.txt (61%)
 create mode 100644 Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Simple-check.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Simple.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/check.cmake


hooks/post-receive
-- 
CMake