[Cmake-commits] CMake branch, next, updated. v3.2.1-1331-g0740c79

[Bill Hoffman]

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  0740c7982f8f91f97223e6167d975eb488df2fc2 (commit)
       via  4c693cebe35c199d8fba8ce49b3a8bfec441bfe9 (commit)
      from  3720acd7bfebe5f6ab4221162e6d1dae4eb6d19a (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=0740c7982f8f91f97223e6167d975eb488df2fc2
commit 0740c7982f8f91f97223e6167d975eb488df2fc2
Merge: 3720acd 4c693ce
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Mar 31 15:05:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 15:05:14 2015 -0400

    Merge topic 'test_cpack_symlinks' into next
    
    4c693ceb Add a test case for CPack with symbolic links in the source tree.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c693cebe35c199d8fba8ce49b3a8bfec441bfe9
commit 4c693cebe35c199d8fba8ce49b3a8bfec441bfe9
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Mar 31 15:04:39 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Mar 31 15:04:39 2015 -0400

    Add a test case for CPack with symbolic links in the source tree.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 7b9c810..1242332 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -203,6 +203,11 @@ add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
 add_RunCMake_test(CTestCommandLine)
+# Only run this test on unix platforms that support
+# symbolic links
+if(UNIX)
+  add_RunCMake_test(CPackSymlinks)
+endif()
 
 set(IfacePaths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
 add_RunCMake_test(IfacePaths_INCLUDE_DIRECTORIES TEST_DIR IfacePaths)
diff --git a/Tests/RunCMake/CPackSymlinks/CMakeLists.txt b/Tests/RunCMake/CPackSymlinks/CMakeLists.txt
new file mode 100644
index 0000000..dbaa24c
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake b/Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
new file mode 100644
index 0000000..845c377
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
@@ -0,0 +1 @@
+include(CPack)
diff --git a/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
new file mode 100644
index 0000000..3431eae
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
@@ -0,0 +1,21 @@
+include(RunCMake)
+
+function(run_cpack_symlink_test TEST_NAME)
+  set(RunCMake_TEST_NO_CLEAN TRUE)
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-build")
+  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-source")
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}")
+  execute_process(
+    COMMAND "${CMAKE_COMMAND}" -E tar xvf
+      "${RunCMake_SOURCE_DIR}/testcpacksym.tar"
+    WORKING_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}"
+    )
+  run_cmake(${TEST_NAME})
+  run_cmake_command(${TEST_NAME} ${CMAKE_CPACK_COMMAND}
+   --config CPackSourceConfig.cmake)
+endfunction()
+
+run_cpack_symlink_test(CPack_TestSymlinks)
diff --git a/Tests/RunCMake/CPackSymlinks/testcpacksym.tar b/Tests/RunCMake/CPackSymlinks/testcpacksym.tar
new file mode 100644
index 0000000..6e5017e
Binary files /dev/null and b/Tests/RunCMake/CPackSymlinks/testcpacksym.tar differ

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                      |    5 +++++
 .../{CPackRPM => CPackSymlinks}/CMakeLists.txt     |    3 ---
 .../CPackSymlinks/CPack_TestSymlinks.cmake         |    1 +
 Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake    |   21 ++++++++++++++++++++
 .../RunCMake/CPackSymlinks/testcpacksym.tar        |  Bin 12292 -> 10240 bytes
 5 files changed, 27 insertions(+), 3 deletions(-)
 copy Tests/RunCMake/{CPackRPM => CPackSymlinks}/CMakeLists.txt (72%)
 create mode 100644 Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
 create mode 100644 Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
 copy Modules/CPack.DS_Store.in => Tests/RunCMake/CPackSymlinks/testcpacksym.tar (64%)


hooks/post-receive
-- 
CMake