[Avida-cvs] [Avida2-svn] r370 - in branches/brysonda: . Avida2.xcodeproj source source/main source/viewer
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Thu Nov 3 20:43:44 PST 2005
Author: brysonda
Date: 2005-11-03 23:43:43 -0500 (Thu, 03 Nov 2005)
New Revision: 370
Modified:
branches/brysonda/Avida2.xcodeproj/project.pbxproj
branches/brysonda/CMakeLists.txt
branches/brysonda/source/CMakeLists.txt
branches/brysonda/source/main/CMakeLists.txt
branches/brysonda/source/viewer/CMakeLists.txt
Log:
Adjust CMake build system to handle new analyze directory
Modified: branches/brysonda/Avida2.xcodeproj/project.pbxproj
===================================================================
--- branches/brysonda/Avida2.xcodeproj/project.pbxproj 2005-11-04 03:50:46 UTC (rev 369)
+++ branches/brysonda/Avida2.xcodeproj/project.pbxproj 2005-11-04 04:43:43 UTC (rev 370)
@@ -408,6 +408,7 @@
70422A25091B141000A5E67F /* cAnalyzeGenotype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cAnalyzeGenotype.h; sourceTree = "<group>"; };
70422A26091B141000A5E67F /* cAnalyzeUtil.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cAnalyzeUtil.cc; sourceTree = "<group>"; };
70422A27091B141000A5E67F /* cAnalyzeUtil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cAnalyzeUtil.h; sourceTree = "<group>"; };
+ 70422A44091B1B8500A5E67F /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
704866B3090B51310048600A /* cAvidaDriver_TextPopViewer.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cAvidaDriver_TextPopViewer.cc; sourceTree = "<group>"; };
704866B4090B51310048600A /* cAvidaDriver_TextPopViewer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cAvidaDriver_TextPopViewer.h; sourceTree = "<group>"; };
704866B5090B51310048600A /* cBarScreen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cBarScreen.cc; sourceTree = "<group>"; };
@@ -1038,6 +1039,7 @@
70422A1B091B141000A5E67F /* analyze */ = {
isa = PBXGroup;
children = (
+ 70422A44091B1B8500A5E67F /* CMakeLists.txt */,
70422A1C091B141000A5E67F /* cAnalyze.cc */,
70422A1D091B141000A5E67F /* cAnalyze.h */,
70422A1E091B141000A5E67F /* cAnalyzeCommand.h */,
Modified: branches/brysonda/CMakeLists.txt
===================================================================
--- branches/brysonda/CMakeLists.txt 2005-11-04 03:50:46 UTC (rev 369)
+++ branches/brysonda/CMakeLists.txt 2005-11-04 04:43:43 UTC (rev 370)
@@ -224,6 +224,7 @@
# Shortcuts to the source subdirectories.
SET(THIRDPARTY_SRC_DIR ${PROJECT_SOURCE_DIR}/source/third-party)
SET(TOOLS_SRC_DIR ${PROJECT_SOURCE_DIR}/source/tools)
+SET(ANALYZE_SRC_DIR ${PROJECT_SOURCE_DIR}/source/analyze)
SET(CPU_SRC_DIR ${PROJECT_SOURCE_DIR}/source/cpu)
SET(EVENT_SRC_DIR ${PROJECT_SOURCE_DIR}/source/event)
SET(MAIN_SRC_DIR ${PROJECT_SOURCE_DIR}/source/main)
@@ -231,6 +232,7 @@
# Shortcuts to the build subdirectories.
SET(THIRDPARTY_BLD_DIR ${PROJECT_BINARY_DIR}/source/third-party)
SET(TOOLS_BLD_DIR ${PROJECT_BINARY_DIR}/source/tools)
+SET(ANALYZE_BLD_DIR ${PROJECT_BINARY_DIR}/source/analyze)
SET(CPU_BLD_DIR ${PROJECT_BINARY_DIR}/source/cpu)
SET(EVENT_BLD_DIR ${PROJECT_BINARY_DIR}/source/event)
SET(MAIN_BLD_DIR ${PROJECT_BINARY_DIR}/source/main)
@@ -239,6 +241,7 @@
# include-directories).
SET(ALL_INC_DIRS
${TOOLS_SRC_DIR}
+ ${ANALYZE_SRC_DIR}
${CPU_SRC_DIR}
${EVENT_SRC_DIR}
${EVENT_BLD_DIR}
@@ -250,6 +253,7 @@
# link-subdirecties).
SET(ALL_LIB_DIRS
${TOOLS_BLD_DIR}
+ ${ANALYZE_BLD_DIR}
${CPU_BLD_DIR}
${EVENT_BLD_DIR}
${MAIN_BLD_DIR}
Modified: branches/brysonda/source/CMakeLists.txt
===================================================================
--- branches/brysonda/source/CMakeLists.txt 2005-11-04 03:50:46 UTC (rev 369)
+++ branches/brysonda/source/CMakeLists.txt 2005-11-04 04:43:43 UTC (rev 370)
@@ -1,5 +1,5 @@
-SUBDIRS(cpu event main third-party tools support utils/task_events)
+SUBDIRS(analyze cpu event main third-party tools support utils/task_events)
IF(AVD_GUI_NCURSES)
SUBDIRS(viewer)
ENDIF(AVD_GUI_NCURSES)
@@ -8,4 +8,4 @@
ENDIF(AVD_PY_BINDINGS)
IF(AVD_UNIT_TESTS)
SUBDIRS(testsuites)
-ENDIF(AVD_UNIT_TESTS)
\ No newline at end of file
+ENDIF(AVD_UNIT_TESTS)
Modified: branches/brysonda/source/main/CMakeLists.txt
===================================================================
--- branches/brysonda/source/main/CMakeLists.txt 2005-11-04 03:50:46 UTC (rev 369)
+++ branches/brysonda/source/main/CMakeLists.txt 2005-11-04 04:43:43 UTC (rev 370)
@@ -2,9 +2,6 @@
SET(libmain_a_SOURCES
avida.cc
- cAnalyze.cc
- cAnalyzeGenotype.cc
- cAnalyzeUtil.cc
cAvidaConfig.cc
cAvidaDriver_Analyze.cc
cAvidaDriver_Base.cc
@@ -64,7 +61,7 @@
IF(AVD_PRIMITIVE)
ADD_EXECUTABLE(primitive primitive.cc)
- TARGET_LINK_LIBRARIES(primitive main cpu event main tools)
+ TARGET_LINK_LIBRARIES(primitive main cpu event analyze cpu main tools)
LINK_DIRECTORIES(${ALL_LIB_DIRS})
INSTALL_TARGETS(/work primitive)
ENDIF(AVD_PRIMITIVE)
Modified: branches/brysonda/source/viewer/CMakeLists.txt
===================================================================
--- branches/brysonda/source/viewer/CMakeLists.txt 2005-11-04 03:50:46 UTC (rev 369)
+++ branches/brysonda/source/viewer/CMakeLists.txt 2005-11-04 04:43:43 UTC (rev 370)
@@ -25,29 +25,18 @@
ADD_LIBRARY(cursesviewer ${libviewer_SOURCES})
ADD_EXECUTABLE(viewer viewer.cc)
- IF(WIN32)
- TARGET_LINK_LIBRARIES(viewer
- cursesviewer
- main
- cpu
- event
- main
- tools
- trio
- ${NCURSES_LIBRARY}
- )
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(viewer
- cursesviewer
- main
- cpu
- event
- main
- tools
- trio
- ${NCURSES_LIBRARY}
- )
- ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(viewer
+ cursesviewer
+ main
+ cpu
+ event
+ analyze
+ cpu
+ main
+ tools
+ trio
+ ${NCURSES_LIBRARY}
+ )
LINK_DIRECTORIES(${ALL_LIB_DIRS} ${THIRDPARTY_BLD_DIR}/trio)
INSTALL_TARGETS(/work viewer)
More information about the Avida-cvs
mailing list