Revision: 68848
http://sourceforge.net/p/brlcad/code/68848
Author: starseeker
Date: 2016-09-19 15:06:15 +0000 (Mon, 19 Sep 2016)
Log Message:
-----------
We need CPACK_PACKAGING_INSTALL_PREFIX if we're doing an RPM...
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in
Modified: brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in 2016-09-19
01:06:21 UTC (rev 68847)
+++ brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in 2016-09-19
15:06:15 UTC (rev 68848)
@@ -46,8 +46,10 @@
endif(CPACK_GENERATOR MATCHES "ZIP" OR CPACK_GENERATOR MATCHES "TGZ" OR
CPACK_GENERATOR MATCHES "TBZ2" )
endif(CPACK_INSTALLED_DIRECTORIES)
-# Null out the install prefix regardless
-set(CPACK_PACKAGING_INSTALL_PREFIX "")
+# Null out the install prefix, unless we're working on an RPM
+if(NOT CPACK_GENERATOR MATCHES "RPM")
+ set(CPACK_PACKAGING_INSTALL_PREFIX "")
+endif(NOT CPACK_GENERATOR MATCHES "RPM")
# Local Variables:
# tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
