[Cmake-commits] CMake branch, next, updated. v3.2.1-1342-g4704f65
Brad King
brad.king at kitware.com
Wed Apr 1 13:00:08 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 4704f65dd10366137d9d04cecd70355cdd8825c0 (commit)
via 6df91a60a90479a0edc403c1e6d5f6cb69747413 (commit)
via f57e02b129a54bfa2fc0a4ab617e84ffb69f66bf (commit)
from 78fb739f9a33b22eca2339a2c33bb23ba1808781 (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=4704f65dd10366137d9d04cecd70355cdd8825c0
commit 4704f65dd10366137d9d04cecd70355cdd8825c0
Merge: 78fb739 6df91a6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 13:00:06 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 1 13:00:06 2015 -0400
Merge topic 'test_cpack_symlinks' into next
6df91a60 cpack: Disable CMake Cygwin legacy warning while packaging
f57e02b1 fixup! Add a test case for CPack with symbolic links in the source tree.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6df91a60a90479a0edc403c1e6d5f6cb69747413
commit 6df91a60a90479a0edc403c1e6d5f6cb69747413
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:55:39 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() )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f57e02b129a54bfa2fc0a4ab617e84ffb69f66bf
commit f57e02b129a54bfa2fc0a4ab617e84ffb69f66bf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 11:46:20 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 1 12:55:39 2015 -0400
fixup! Add a test case for CPack with symbolic links in the source tree.
diff --git a/Tests/RunCMake/CPackSymlinks/CMakeLists.txt b/Tests/RunCMake/CPackSymlinks/CMakeLists.txt
deleted file mode 100644
index dbaa24c..0000000
--- a/Tests/RunCMake/CPackSymlinks/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 845c377..0000000
--- a/Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include(CPack)
diff --git a/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
index 3431eae..439d95e 100644
--- a/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
@@ -1,21 +1,20 @@
include(RunCMake)
-function(run_cpack_symlink_test TEST_NAME)
+function(run_cpack_symlink_test)
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")
+ 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(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_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
)
- run_cmake(${TEST_NAME})
- run_cmake_command(${TEST_NAME} ${CMAKE_CPACK_COMMAND}
- --config CPackSourceConfig.cmake)
endfunction()
-run_cpack_symlink_test(CPack_TestSymlinks)
+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
index 6e5017e..31f34a0 100644
Binary files a/Tests/RunCMake/CPackSymlinks/testcpacksym.tar and b/Tests/RunCMake/CPackSymlinks/testcpacksym.tar differ
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cpack.cxx | 3 +++
Tests/RunCMake/CPackSymlinks/CMakeLists.txt | 4 ----
.../CPackSymlinks/CPack_TestSymlinks.cmake | 1 -
Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake | 23 ++++++++++----------
.../CPackSymlinks/SrcSymlinksTar-stdout.txt | 10 +++++++++
Tests/RunCMake/CPackSymlinks/testcpacksym.tar | Bin 10240 -> 10240 bytes
6 files changed, 24 insertions(+), 17 deletions(-)
delete mode 100644 Tests/RunCMake/CPackSymlinks/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
create mode 100644 Tests/RunCMake/CPackSymlinks/SrcSymlinksTar-stdout.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list