Revision: 42138
http://brlcad.svn.sourceforge.net/brlcad/?rev=42138&view=rev
Author: starseeker
Date: 2011-01-12 14:36:05 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Small change, but important for CPack packages - don't use absolute dirs as
targets for install, which allows CPack to put things in the package without
hard-coding the prefix (in essence building a subdirectory structure inside the
archive
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-12 13:51:59 UTC (rev
42137)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-12 14:36:05 UTC (rev
42138)
@@ -348,7 +348,7 @@
# for more flexibility in using individual libraries in other projects.
MACRO(INSTALL_DIR upper suffix)
IF(NOT ${CMAKE_PROJECT_NAME}_INSTALL_${upper}_DIR)
- SET(${CMAKE_PROJECT_NAME}_INSTALL_${upper}_DIR
${CMAKE_INSTALL_PREFIX}/${suffix})
+ SET(${CMAKE_PROJECT_NAME}_INSTALL_${upper}_DIR ${suffix})
SET(${upper}_DIR ${suffix})
ENDIF(NOT ${CMAKE_PROJECT_NAME}_INSTALL_${upper}_DIR)
ENDMACRO(INSTALL_DIR upper suffix)
@@ -1034,7 +1034,11 @@
SET(CURRENT_LABEL " ${CURRENT_LABEL}")
STRING(LENGTH ${CURRENT_LABEL} CURRENTLENGTH)
ENDWHILE(${PATHLABELLENGTH} GREATER ${CURRENTLENGTH})
- MESSAGE("${CURRENT_LABEL}: ${${path_label}}")
+ IF(path_label MATCHES "^CMAKE_INSTALL_PREFIX$")
+ MESSAGE("${CURRENT_LABEL}: ${${path_label}}")
+ ELSE(path_label MATCHES "^CMAKE_INSTALL_PREFIX$")
+ MESSAGE("${CURRENT_LABEL}:
${CMAKE_INSTALL_PREFIX}/${${path_label}}")
+ ENDIF(path_label MATCHES "^CMAKE_INSTALL_PREFIX$")
ENDFOREACH()
MESSAGE("")
IF(CMAKE_BUILD_TYPE MATCHES "^Basic$")
@@ -1319,7 +1323,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR ${BRLCAD_MAJOR_VERSION})
SET(CPACK_PACKAGE_VERSION_MINOR ${BRLCAD_MINOR_VERSION})
SET(CPACK_PACKAGE_VERSION_PATCH ${BRLCAD_PATCH_VERSION})
-SET(CPACK_SET_DESTDIR ON)
SET(CPACK_GENERATOR TGZ TBZ2)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
