[brlcad-commits] SF.net SVN: brlcad:[44493] brlcad/trunk

[<sta...@us...>]

Revision: 44493
          http://brlcad.svn.sourceforge.net/brlcad/?rev=44493&view=rev
Author:   starseeker
Date:     2011-04-25 21:02:41 +0000 (Mon, 25 Apr 2011)

Log Message:
-----------
Take a stab at using CPack options to get the directory structure we want.

Modified Paths:
--------------
    brlcad/trunk/CMakeLists.txt

Added Paths:
-----------
    brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in

Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt	2011-04-25 20:35:51 UTC (rev 44492)
+++ brlcad/trunk/CMakeLists.txt	2011-04-25 21:02:41 UTC (rev 44493)
@@ -1432,6 +1432,10 @@
 SET(CPACK_SOURCE_GENERATOR TGZ TBZ2 ZIP)
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "brlcad-${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
 SET(CPACK_SOURCE_IGNORE_FILES "\\\\.svn/")
+
+CONFIGURE_FILE("${BRLCAD_CMAKE_DIR}/BRLCAD_CPackOptions.cmake.in"	"${CMAKE_BINARY_DIR}/BRLCAD_CPackOptions.cmake" @ONLY)
+SET(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/BRLCAD_CPackOptions.cmake")
+
 INCLUDE(CPack)
 
 # Some files to ignore for distcheck

Added: brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in	                        (rev 0)
+++ brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in	2011-04-25 21:02:41 UTC (rev 44493)
@@ -0,0 +1,10 @@
+# This file is configured at cmake time, and loaded at cpack time.
+# To pass variables to cpack from cmake, they must be configured
+# in this file.  
+
+# Don't want to use the install prefix when we're making source
+# tarballs
+IF(CPACK_GENERATOR MATCHES "ZIP" OR CPACK_GENERATOR MATCHES "TGZ" OR CPACK_GENERATOR MATCHES "TBZ2" )
+	SET(CPACK_PACKAGING_INSTALL_PREFIX "")
+ENDIF(CPACK_GENERATOR MATCHES "ZIP" OR CPACK_GENERATOR MATCHES "TGZ" OR CPACK_GENERATOR MATCHES "TBZ2" )
+


Property changes on: brlcad/trunk/misc/CMake/BRLCAD_CPackOptions.cmake.in
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.