[Cmake-commits] CMake branch, next, updated. v3.1.1-2433-g6682a9b
Brad King
brad.king at kitware.com
Thu Jan 29 09:02:34 EST 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 6682a9b18838c15070d7aed2be0dc9364910575c (commit)
via 319326525a7ecfae55fed4f3e5ce2b2dad2449be (commit)
from ba1bdf72bc7fb34ac897056d5ec0c94e80bac393 (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=6682a9b18838c15070d7aed2be0dc9364910575c
commit 6682a9b18838c15070d7aed2be0dc9364910575c
Merge: ba1bdf7 3193265
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 29 09:02:33 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 29 09:02:33 2015 -0500
Merge topic 'rpm_multi_prefix' into next
31932652 fixup! cpack rpm multiple path relocation prefixes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=319326525a7ecfae55fed4f3e5ce2b2dad2449be
commit 319326525a7ecfae55fed4f3e5ce2b2dad2449be
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jan 28 23:48:57 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 29 08:57:11 2015 -0500
fixup! cpack rpm multiple path relocation prefixes
CPackRPM test was refactored to use RunCMake infrastructure.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 007f735..dea30e4 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -832,15 +832,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
# Do not try to build RPM
if (NOT RPMBUILD)
set(CPACK_BINARY_RPM OFF)
- else()
- add_test(CPack-RPM ${CMAKE_CMAKE_COMMAND}
- -D dir=${CMake_BINARY_DIR}/Tests/CPackRPM
- -D CMake_SOURCE_DIR=${CMake_SOURCE_DIR}
- -D CMAKE_CMAKE_COMMAND=${CMAKE_CMAKE_COMMAND}
- -P ${CMake_SOURCE_DIR}/Tests/CPackRPM/RunCPack.cmake
- )
- list(APPEND TEST_BUILD_DIRS
- "${CMake_BINARY_DIR}/Tests/CPackRPM")
endif()
find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
diff --git a/Tests/CPackRPM/RunCPack.cmake b/Tests/CPackRPM/RunCPack.cmake
deleted file mode 100644
index 8bef611..0000000
--- a/Tests/CPackRPM/RunCPack.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-file(MAKE_DIRECTORY "${dir}")
-
-# run cmake
-execute_process(
- COMMAND "${CMAKE_CMAKE_COMMAND}" "${CMake_SOURCE_DIR}/Tests/CPackRPM"
- WORKING_DIRECTORY "${dir}"
- OUTPUT_QUIET)
-
-# package RPM
-execute_process(
- COMMAND make package
- WORKING_DIRECTORY "${dir}"
- ERROR_VARIABLE stderr
- OUTPUT_QUIET)
-
-# test for partial relocation warning
-if(NOT "${stderr}" MATCHES "CPackRPM:Warning: Path /not_relocatable/CMakeLists.txt is not on one of the.*relocatable paths! Package will be partially relocatable.")
- message(FATAL_ERROR "CPack/RPM missing partially relocatable warning; stderr output: '${stderr}'")
-endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index b5e41d9..15a24de 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -173,3 +173,7 @@ add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)
+
+if(RPMBUILD)
+ add_RunCMake_test(CPackRPM)
+endif()
diff --git a/Tests/RunCMake/CPackRPM/CMakeLists.txt b/Tests/RunCMake/CPackRPM/CMakeLists.txt
new file mode 100644
index 0000000..b7d170b
--- /dev/null
+++ b/Tests/RunCMake/CPackRPM/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
+
+set(CPACK_GENERATOR "RPM")
+include(CPack)
diff --git a/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt b/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt
new file mode 100644
index 0000000..3b63d5b
--- /dev/null
+++ b/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt
@@ -0,0 +1 @@
+CPackRPM:Warning: Path /not_relocatable/CMakeLists.txt is not on one of the.*relocatable paths! Package will be partially relocatable.
diff --git a/Tests/CPackRPM/CMakeLists.txt b/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake
similarity index 70%
rename from Tests/CPackRPM/CMakeLists.txt
rename to Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake
index 968f6d6..3ace6a8 100644
--- a/Tests/CPackRPM/CMakeLists.txt
+++ b/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake
@@ -1,14 +1,7 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-project(CPackRPM)
-
install(FILES CMakeLists.txt DESTINATION /not_relocatable COMPONENT static)
install(FILES CMakeLists.txt DESTINATION relocatable COMPONENT relocatable)
set(CPACK_PACKAGE_RELOCATABLE TRUE)
-set(CPACK_GENERATOR "RPM")
set(CPACK_PACKAGING_INSTALL_PREFIX "/opt")
set(CPACK_RPM_COMPONENT_INSTALL ON)
-
-include(CPack)
diff --git a/Tests/RunCMake/CPackRPM/RunCMakeTest.cmake b/Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
new file mode 100644
index 0000000..1935e32
--- /dev/null
+++ b/Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
@@ -0,0 +1,17 @@
+include(RunCMake)
+
+function(run_cpack_rpm_test TEST_NAME)
+ set(RunCMake_TEST_NO_CLEAN TRUE)
+ set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-build")
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+ execute_process(
+ COMMAND "${CMAKE_COMMAND}" -D RunCMake_TEST=${TEST_NAME} "${RunCMake_SOURCE_DIR}"
+ WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"
+ OUTPUT_QUIET
+ ERROR_QUIET
+ )
+ run_cmake_command(${TEST_NAME} ${CMAKE_CPACK_COMMAND})
+endfunction()
+
+run_cpack_rpm_test(CPackRPM_PARTIALLY_RELOCATABLE_WARNING)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 9 ---------
Tests/CPackRPM/RunCPack.cmake | 21 --------------------
Tests/RunCMake/CMakeLists.txt | 4 ++++
Tests/RunCMake/CPackRPM/CMakeLists.txt | 7 +++++++
...ackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt | 1 +
.../CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake} | 7 -------
Tests/RunCMake/CPackRPM/RunCMakeTest.cmake | 17 ++++++++++++++++
7 files changed, 29 insertions(+), 37 deletions(-)
delete mode 100644 Tests/CPackRPM/RunCPack.cmake
create mode 100644 Tests/RunCMake/CPackRPM/CMakeLists.txt
create mode 100644 Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt
rename Tests/{CPackRPM/CMakeLists.txt => RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake} (70%)
create mode 100644 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list