[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-598-g452eb7e

Brad King brad.king at kitware.com
Mon Feb 23 10:20:37 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  452eb7ef198d9792086517ddb93ddaeff35facce (commit)
       via  8c0474cd2c0b3ad589950bc60d9af22f26111717 (commit)
      from  c2459bf1167b9e019292b7dfe1b7cb2bf9657a36 (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=452eb7ef198d9792086517ddb93ddaeff35facce
commit 452eb7ef198d9792086517ddb93ddaeff35facce
Merge: c2459bf 8c0474c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:20:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:20:37 2015 -0500

    Merge topic 'rpm_run_tests_on_other_platforms' into next
    
    8c0474cd CPackRPM: run tests on more platforms than just Linux


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c0474cd2c0b3ad589950bc60d9af22f26111717
commit 8c0474cd2c0b3ad589950bc60d9af22f26111717
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Feb 23 00:43:09 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:19:29 2015 -0500

    CPackRPM: run tests on more platforms than just Linux
    
    Lift the restriction that limits use of CPackRPM tests to Linux OS only
    because RPM can also be used on e.g. AIX which is Unix OS.

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:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list