Revision: 41012
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41012
Author: campbellbarton
Date: 2011-10-14 14:01:39 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
cmake: use cached results for RPM build & dont print annoying rpmbuild missing
on every re-run of cmake.
Modified Paths:
--------------
trunk/blender/build_files/cmake/RpmBuild.cmake
Modified: trunk/blender/build_files/cmake/RpmBuild.cmake
===================================================================
--- trunk/blender/build_files/cmake/RpmBuild.cmake 2011-10-14 13:13:13 UTC
(rev 41011)
+++ trunk/blender/build_files/cmake/RpmBuild.cmake 2011-10-14 14:01:39 UTC
(rev 41012)
@@ -3,17 +3,24 @@
# Authors: Rohit Yadav <[email protected]>
#
-find_program(RPMBUILD
- NAMES rpmbuild
- PATHS "/usr/bin")
+if(NOT DEFINED RPMBUILD)
-mark_as_advanced(RPMBUILD)
+ find_program(RPMBUILD
+ NAMES rpmbuild
+ PATHS "/usr/bin")
+ mark_as_advanced(RPMBUILD)
+
+ if(RPMBUILD)
+ message(STATUS "RPM Build Found: ${RPMBUILD}")
+ else(RPMBUILD)
+ message(STATUS "RPM Build Not Found (rpmbuild). RPM generation
will not be available")
+ endif()
+
+endif()
+
if(RPMBUILD)
- get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE)
- message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}")
- set(RPMBUILD_FOUND "YES")
+ set(RPMBUILD_FOUND TRUE)
else(RPMBUILD)
- message(STATUS "rpmbuild NOT found. RPM generation will not be available")
- set(RPMBUILD_FOUND "NO")
-endif()
+ set(RPMBUILD_FOUND FALSE)
+endif()
\ No newline at end of file
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
