[Cmake-commits] CMake branch, next, updated. v3.1.1-2265-gd07f9d2

[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  d07f9d28f1d7d552e5a42dd7bdd3a91856375e5c (commit)
       via  36f93b606c4a14efdccee80b6a6a738f6795408c (commit)
      from  f682e2a20b69b8bb1113ea25e907b03dd3fe4ba5 (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=d07f9d28f1d7d552e5a42dd7bdd3a91856375e5c
commit d07f9d28f1d7d552e5a42dd7bdd3a91856375e5c
Merge: f682e2a 36f93b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 23 08:34:23 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 23 08:34:23 2015 -0500

    Merge topic 'rpm_multi_prefix' into next
    
    36f93b60 fixup! cpack rpm multiple path relocation prefixes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36f93b606c4a14efdccee80b6a6a738f6795408c
commit 36f93b606c4a14efdccee80b6a6a738f6795408c
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Jan 23 09:14:36 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 23 08:28:54 2015 -0500

    fixup! cpack rpm multiple path relocation prefixes
    
    Relocatable prefix tests were failing on Fedora Linux distributions.

diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt
index ff40e30..b55594e 100644
--- a/Tests/CPackComponentsForAll/CMakeLists.txt
+++ b/Tests/CPackComponentsForAll/CMakeLists.txt
@@ -110,6 +110,12 @@ set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Developer Full)
 set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
 set(CPACK_COMPONENT_APPLICATIONS_INSTALL_TYPES Full)
 
+# set CPACK_RPM_RELOCATION_PATHS here as GNUInstallDirs script
+# can not be used in CPack scripts due to CMAKE_SIZEOF_VOID_P
+# variable not being set
+set(CPACK_RPM_RELOCATION_PATHS "${CMAKE_INSTALL_INCLUDEDIR}"
+  "${CMAKE_INSTALL_LIBDIR}" "${CMAKE_INSTALL_BINDIR}")
+
 # We may use the CPack specific config file in order
 # to tailor CPack behavior on a CPack generator specific way
 # (Behavior would be different for RPM or TGZ or DEB ...)
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
index e597480..de0ee46 100644
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
+++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
@@ -6,12 +6,7 @@ if(CPACK_GENERATOR MATCHES "ZIP")
 endif()
 
 if(CPACK_GENERATOR MATCHES "RPM")
-  # set gnu install prefixes
-  include(GNUInstallDirs)
-
   set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
-  set(CPACK_RPM_RELOCATION_PATHS "${CMAKE_INSTALL_INCLUDEDIR}"
-    "${CMAKE_INSTALL_LIBDIR}" "${CMAKE_INSTALL_BINDIR}")
 
   set(CPACK_RPM_COMPONENT_INSTALL "ON")
   set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries")
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index aeb7ebc..68d846f 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -141,6 +141,8 @@ if(CPackGen MATCHES "RPM")
 
   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
+    # relocation path test won't fail on OSes with lib64 library location
     include(GNUInstallDirs)
     set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
 
diff --git a/Tests/CPackRPM/CMakeLists.txt b/Tests/CPackRPM/CMakeLists.txt
index a951610..968f6d6 100644
--- a/Tests/CPackRPM/CMakeLists.txt
+++ b/Tests/CPackRPM/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 project(CPackRPM)
 
diff --git a/Tests/CPackRPM/RunCPack.cmake b/Tests/CPackRPM/RunCPack.cmake
index 2547262..8bef611 100644
--- a/Tests/CPackRPM/RunCPack.cmake
+++ b/Tests/CPackRPM/RunCPack.cmake
@@ -1,13 +1,19 @@
+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 ${CMAKE_CMAKE_COMMAND}
-    "${CMake_SOURCE_DIR}/Tests/CPackRPM"
   COMMAND make package
-  RESULT_VARIABLE result
-  OUTPUT_VARIABLE stdout
+  WORKING_DIRECTORY "${dir}"
   ERROR_VARIABLE stderr
-  WORKING_DIRECTORY ${dir})
+  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.")

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

Summary of changes:
 Tests/CPackComponentsForAll/CMakeLists.txt             |    6 ++++++
 .../MyLibCPackConfig-IgnoreGroup.cmake.in              |    5 -----
 Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake |    2 ++
 Tests/CPackRPM/CMakeLists.txt                          |    2 +-
 Tests/CPackRPM/RunCPack.cmake                          |   16 +++++++++++-----
 5 files changed, 20 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake