[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-591-g743fe7d

Domen Vrankar domen.vrankar at gmail.com
Sun Feb 22 18:44:38 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  743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a (commit)
       via  f21e4ae9652b17457dc058b598274538a7ff2d89 (commit)
      from  98f77b65bf1848fd3b29c4fe3a4c2b041258aa58 (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=743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a
commit 743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a
Merge: 98f77b6 f21e4ae
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 22 18:44:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 18:44:37 2015 -0500

    Merge topic 'rpm_run_tests_on_other_platforms' into next
    
    f21e4ae9 CPack/RPM: run tests on other platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f21e4ae9652b17457dc058b598274538a7ff2d89
commit f21e4ae9652b17457dc058b598274538a7ff2d89
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Feb 23 00:43:09 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon Feb 23 00:43:09 2015 +0100

    CPack/RPM: run tests on other platforms
    
    Current restriction limits use of CPackRPM
    tests to Linux OS only but RPM can also be
    used on for e.g. AIX which is Unix OS.
    Patch removes OS specific restriction.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cb45e79..4d3aeaf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -104,7 +104,7 @@ if(BUILD_TESTING)
 
   # Look for rpmbuild to use for tests.
   # The tool does not work with spaces in the path.
-  if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
+  if(NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
     find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild)
   else()
     set(RPMBUILD_EXECUTABLE "RPMBUILD_EXECUTABLE-NOTFOUND")

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list