[Cmake-commits] CMake branch, next, updated. v3.2.1-1345-g1c08496

[Brad King]

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  1c08496a772bc81169a3c3b19c4ef167c9548e8f (commit)
       via  8b354630d9c4601aaff6339aed518fad1012a8b6 (commit)
       via  aca1d93bd9b9921ecef83b80bed219a2f5879500 (commit)
      from  4704f65dd10366137d9d04cecd70355cdd8825c0 (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=1c08496a772bc81169a3c3b19c4ef167c9548e8f
commit 1c08496a772bc81169a3c3b19c4ef167c9548e8f
Merge: 4704f65 8b35463
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 13:00:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 1 13:00:46 2015 -0400

    Merge topic 'test_cpack_symlinks' into next
    
    8b354630 Tests: Add case for CPack source package with symlinks
    aca1d93b cpack: Disable CMake Cygwin legacy warning while packaging


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b354630d9c4601aaff6339aed518fad1012a8b6
commit 8b354630d9c4601aaff6339aed518fad1012a8b6
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Mar 31 15:04:39 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 1 12:57:45 2015 -0400

    Tests: Add case for CPack source package with symlinks

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/RunCMakeTest.cmake b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
new file mode 100644
index 0000000..439d95e
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
@@ -0,0 +1,20 @@
+include(RunCMake)
+
+function(run_cpack_symlink_test)
+  set(RunCMake_TEST_NO_CLEAN TRUE)
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/SrcSymlinks-build")
+  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/SrcSymlinks")
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}")
+  run_cmake_command(SrcSymlinksTar
+    ${CMAKE_COMMAND} -E chdir ${RunCMake_TEST_SOURCE_DIR}
+    ${CMAKE_COMMAND} -E tar xvf ${RunCMake_SOURCE_DIR}/testcpacksym.tar
+    )
+  run_cmake(SrcSymlinksCMake)
+  run_cmake_command(SrcSymlinksCPack
+    ${CMAKE_CPACK_COMMAND} --config CPackSourceConfig.cmake
+    )
+endfunction()
+
+run_cpack_symlink_test()
diff --git a/Tests/RunCMake/CPackSymlinks/SrcSymlinksTar-stdout.txt b/Tests/RunCMake/CPackSymlinks/SrcSymlinksTar-stdout.txt
new file mode 100644
index 0000000..24ad124
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/SrcSymlinksTar-stdout.txt
@@ -0,0 +1,10 @@
+^x CMakeLists.txt
+x cygwin/
+x cygwin/build.sh
+x cygwin/setup.patch
+x include/
+x include/src.h
+x link.h
+x real.h
+x src/
+x src/src.h$
diff --git a/Tests/RunCMake/CPackSymlinks/testcpacksym.tar b/Tests/RunCMake/CPackSymlinks/testcpacksym.tar
new file mode 100644
index 0000000..31f34a0
Binary files /dev/null and b/Tests/RunCMake/CPackSymlinks/testcpacksym.tar differ

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aca1d93bd9b9921ecef83b80bed219a2f5879500
commit aca1d93bd9b9921ecef83b80bed219a2f5879500
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 12:50:03 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 1 12:57:43 2015 -0400

    cpack: Disable CMake Cygwin legacy warning while packaging
    
    In cpack we load the platform information modules to give the
    configuration scripts access to the host system information.
    CYGWIN.cmake warns unless we explicitly tell it not to warn
    since there is no chance for a cmake_minimum_required(VERSION)
    to be called.

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 6106472..00b23cd 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -203,6 +203,9 @@ int main (int argc, char const* const* argv)
   cmgg.SetCMakeInstance(&cminst);
   cmsys::auto_ptr<cmLocalGenerator> cmlg(cmgg.CreateLocalGenerator());
   cmMakefile* globalMF = cmlg->GetMakefile();
+#if defined(__CYGWIN__)
+  globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0");
+#endif
 
   bool cpackConfigFileSpecified = true;
   if ( cpackConfigFile.empty() )

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

Summary of changes:


hooks/post-receive
-- 
CMake