Revision: 42413
http://brlcad.svn.sourceforge.net/brlcad/?rev=42413&view=rev
Author: starseeker
Date: 2011-01-18 16:21:58 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Successfully generate an NSIS installer, although it doesn't work yet due to
src/other libraries being installed to the wrong dir - need to correct the
CMake files in question or add additional logic in src/other/CMakeLists.txt,
whichever makes sense.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-18 15:39:19 UTC (rev
42412)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-18 16:21:58 UTC (rev
42413)
@@ -360,7 +360,11 @@
INSTALL_DIR(INCLUDE include)
# The location in which to install BRL-CAD libraries.
-INSTALL_DIR(LIB lib)
+IF(NOT WIN32)
+ INSTALL_DIR(LIB lib)
+ELSE(NOT WIN32)
+ INSTALL_DIR(LIB bin)
+ENDIF(NOT WIN32)
# The location in which to install BRL-CAD configuration files.
INSTALL_DIR(CONF etc)
@@ -1317,8 +1321,14 @@
SET(CPACK_PACKAGE_VERSION_MINOR ${BRLCAD_MINOR_VERSION})
SET(CPACK_PACKAGE_VERSION_PATCH ${BRLCAD_PATCH_VERSION})
+IF(UNIX AND NOT APPLE)
SET(CPACK_GENERATOR TGZ TBZ2)
+ENDIF(UNIX AND NOT APPLE)
+IF(WIN32)
+ SET(CPACK_GENERATOR NSIS)
+ENDIF(WIN32)
+
SET(CPACK_SOURCE_GENERATOR TGZ TBZ2 ZIP)
SET(CPACK_SOURCE_PACKAGE_FILE_NAME
"brlcad-${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
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
