Revision: 42268
http://brlcad.svn.sourceforge.net/brlcad/?rev=42268&view=rev
Author: starseeker
Date: 2011-01-14 19:12:52 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
Tweaks to accomidate changes resulting from the new logic - get us building
again.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/bench/CMakeLists.txt
brlcad/branches/cmake/db/CMakeLists.txt
brlcad/branches/cmake/misc/enigma/CMakeLists.txt
brlcad/branches/cmake/src/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
@@ -957,15 +957,7 @@
set_property(CACHE BRLCAD-BUILD_SRC_OTHER PROPERTY STRINGS
"Yes" "No" "Auto")
-
-
-# Virtually all of the BRL-CAD code needs the BRL-CAD include directories
-# and a couple of standard defines - set those up in variables now - the
-# idea being that if any other system-wide defines or include are needed
-# they can just be added here.
-SET(BRLCAD_STD_DEFS "-DHAVE_CONFIG_H;-DBRLCADBUILD=1")
-SET(BRLCAD_STD_INCLUDES
"${BRLCAD_BINARY_DIR}/include/brlcad;${BRLCAD_BINARY_DIR}/include")
-
+# We've done the toplevel configure steps, now add the subdirectories
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(db)
ADD_SUBDIRECTORY(include)
Modified: brlcad/branches/cmake/bench/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/bench/CMakeLists.txt 2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/bench/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
@@ -1,4 +1,5 @@
include_directories(
+ ${BRLCAD_BINARY_DIR}/include/brlcad
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${TCL_INCLUDE_DIRS}
Modified: brlcad/branches/cmake/db/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/db/CMakeLists.txt 2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/db/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
@@ -36,6 +36,7 @@
xmp.asc
)
+FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DATA_DIR}/db)
FOREACH(g_model ${G_SAMPLE_MODELS})
STRING(REGEX REPLACE "([0-9a-z]*).asc" "\\1" g_model_root "${g_model}")
ADD_CUSTOM_COMMAND(
Modified: brlcad/branches/cmake/misc/enigma/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/misc/enigma/CMakeLists.txt 2011-01-14 18:38:27 UTC
(rev 42267)
+++ brlcad/branches/cmake/misc/enigma/CMakeLists.txt 2011-01-14 19:12:52 UTC
(rev 42268)
@@ -1,4 +1,5 @@
include_directories(
+ ${BRLCAD_BINARY_DIR}/include/brlcad
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
)
Modified: brlcad/branches/cmake/src/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/CMakeLists.txt 2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/src/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
@@ -41,6 +41,7 @@
# in all BRL-CAD builds
include_directories(
+ ${BRLCAD_BINARY_DIR}/include/brlcad
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
)
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
