Revision: 41576
http://brlcad.svn.sourceforge.net/brlcad/?rev=41576&view=rev
Author: starseeker
Date: 2010-12-10 17:49:51 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
Dave, let me know if this causes trouble but I'm adding logic to move things to
bin and lib dirs in the build instead of leaving them in the src/...
directories - the BRL-CAD cmake build does this and I've found it convenient...
Modified Paths:
--------------
rt^3/trunk/CMakeLists.txt
rt^3/trunk/src/GS/CMakeLists.txt
Modified: rt^3/trunk/CMakeLists.txt
===================================================================
--- rt^3/trunk/CMakeLists.txt 2010-12-10 15:28:37 UTC (rev 41575)
+++ rt^3/trunk/CMakeLists.txt 2010-12-10 17:49:51 UTC (rev 41576)
@@ -41,6 +41,22 @@
#Set path for cmake modules.
SET(CMAKE_MODULE_PATH "${RT3_ROOT}/cmake")
+PROJECT(RT3)
+
+#---------------------------------------------------------------------
+# Output directories - this is where built library and executable
+# files will be placed after building but prior to install.
+IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${RT3_BINARY_DIR}/lib CACHE INTERNAL
"Single output directory for building all libraries.")
+ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+IF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${RT3_BINARY_DIR}/lib CACHE INTERNAL
"Single output directory for building all archives.")
+ENDIF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+IF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RT3_BINARY_DIR}/bin CACHE INTERNAL
"Single output directory for building all executables.")
+ENDIF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+
+
INCLUDE (cmake/rt3commons.cmake)
#
@@ -142,4 +158,4 @@
MESSAGE(STATUS "\tLast Error: ${RT3_LAST_WARNING_MSG}")
ENDIF (RT3_COMPILE_WARNINGS)
-
\ No newline at end of file
+
Modified: rt^3/trunk/src/GS/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/GS/CMakeLists.txt 2010-12-10 15:28:37 UTC (rev 41575)
+++ rt^3/trunk/src/GS/CMakeLists.txt 2010-12-10 17:49:51 UTC (rev 41576)
@@ -160,3 +160,6 @@
#Build the project
RT3_PROJECT_BUILD_EXE()
+
+#Copy the config file to the same directory as the binary
+configure_file(geoserve.config
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/geoserve.config COPYONLY)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages,
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
