[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-621-gc3f41d0
Brad King
brad.king at kitware.com
Mon Feb 23 10:58:10 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 c3f41d07ce79d23e4bdc79b74fb13463a4241c79 (commit)
via 60ce8dd510b5ddc4d2465d75b059dda2d4e123cd (commit)
from 82c86e4a875fb74ed455a2cf34f2b82a18a1417f (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=c3f41d07ce79d23e4bdc79b74fb13463a4241c79
commit c3f41d07ce79d23e4bdc79b74fb13463a4241c79
Merge: 82c86e4 60ce8dd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:58:09 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:58:09 2015 -0500
Merge topic 'rpm_at_in_path' into next
60ce8dd5 Revert topic 'rpm_at_in_path'
diff --cc Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index f06605a,68d846f..5be9d17
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@@ -209,34 -204,7 +208,11 @@@ if(CPackGen MATCHES "RPM"
message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
endif()
+ string(REGEX MATCH ${check_file_match_expected_architecture} check_file_match_architecture ${check_file_content})
+ if (NOT check_file_match_architecture)
+ message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
+ endif()
endforeach()
-
- # test package content
- foreach(check_file ${expected_file})
- string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
-
- if(check_file_Unspecified_match)
- execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
- OUTPUT_VARIABLE check_file_content
- ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
-
- if(NOT check_at_in_path)
- file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
-
- if(spec_file)
- file(READ ${spec_file} spec_file_content)
- endif()
-
- message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
- endif()
- endif()
- endforeach()
+ elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
endif()
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60ce8dd510b5ddc4d2465d75b059dda2d4e123cd
commit 60ce8dd510b5ddc4d2465d75b059dda2d4e123cd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:57:56 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:57:56 2015 -0500
Revert topic 'rpm_at_in_path'
It will be restored after a conflicting topic is added.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index da9cc80..7516393 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1156,6 +1156,13 @@ if(CPACK_RPM_PACKAGE_DEBUG)
message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
endif()
+# protect @ in pathname in order to avoid their
+# interpretation during the configure_file step
+set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}")
+set(PROTECTED_AT "@")
+string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}")
+set(CPACK_RPM_INSTALL_FILES_LIST "")
+
#
# USER generated/provided spec file handling.
#
@@ -1266,6 +1273,9 @@ else()
configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
endif()
+# remove AT protection
+unset(PROTECTED_AT)
+
if(RPMBUILD_EXECUTABLE)
# Now call rpmbuild using the SPECFILE
execute_process(
diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt
index 51af297..b55594e 100644
--- a/Tests/CPackComponentsForAll/CMakeLists.txt
+++ b/Tests/CPackComponentsForAll/CMakeLists.txt
@@ -43,7 +43,7 @@ install(TARGETS mylibapp
# CPACK_MONOLITHIC_INSTALL=1 is set (at cmake time).
install(TARGETS mylibapp2
RUNTIME
- DESTINATION bin/@in at _@path@@with\\@and\\@/\@in_path\@) # test @ char in path
+ DESTINATION bin)
install(FILES mylib.h
DESTINATION include
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 2597050..68d846f 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -139,7 +139,6 @@ if(CPackGen MATCHES "RPM")
set(CPACK_COMPONENT_HEADERS_DESCRIPTION
"C/C\\+\\+ header files for use with MyLib")
- # test package info
if(${CPackComponentWay} STREQUAL "IgnoreGroup")
# set gnu install prefixes to what they are set during rpm creation
# CMAKE_SIZEOF_VOID_P is not set here but lib is prefix of lib64 so
@@ -206,29 +205,6 @@ if(CPackGen MATCHES "RPM")
message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
endif()
endforeach()
-
- # test package content
- foreach(check_file ${expected_file})
- string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
-
- if(check_file_Unspecified_match)
- execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
- OUTPUT_VARIABLE check_file_content
- ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
-
- if(NOT check_at_in_path)
- file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
-
- if(spec_file)
- file(READ ${spec_file} spec_file_content)
- endif()
-
- message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
- endif()
- endif()
- endforeach()
+ elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackRPM.cmake | 10 ++++++++
Tests/CPackComponentsForAll/CMakeLists.txt | 2 +-
.../RunCPackVerifyResult.cmake | 26 +-------------------
3 files changed, 12 insertions(+), 26 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list