[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-423-g7c404c8

Domen Vrankar domen.vrankar at gmail.com
Thu Jun 11 12:02:58 EDT 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  7c404c8261b4d7d2d6c41fcf2aa5c992366997b7 (commit)
       via  384d6dde2674ff971c4bde5306637b443bc96abf (commit)
      from  3a10e1458d48b95dd4a064e74e15d3dc7f08c311 (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=7c404c8261b4d7d2d6c41fcf2aa5c992366997b7
commit 7c404c8261b4d7d2d6c41fcf2aa5c992366997b7
Merge: 3a10e14 384d6dd
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Jun 11 12:02:58 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 11 12:02:58 2015 -0400

    Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
    
    384d6dde fixup! CPack Deb and RPM RunCMake tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=384d6dde2674ff971c4bde5306637b443bc96abf
commit 384d6dde2674ff971c4bde5306637b443bc96abf
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Jun 11 18:02:14 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Thu Jun 11 18:02:14 2015 +0200

    fixup! CPack Deb and RPM RunCMake tests
    
    rpmbuild can only be used if there are
    no spaces in path

diff --git a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
index 51b77a9..69375e2 100644
--- a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
@@ -1,4 +1,9 @@
 function(get_test_prerequirements found_var config_file)
+  if(CMAKE_CURRENT_BINARY_DIR MATCHES " ")
+    # rpmbuild can't handle spaces in path
+    return()
+  endif()
+
   find_program(RPM_EXECUTABLE rpm)
 
   if(RPM_EXECUTABLE)

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

Summary of changes:
 Tests/RunCMake/CPack/RPM/Prerequirements.cmake |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list