[Avida-cvs] [avida-svn] r698 - in development: . Avida.xcodeproj source source/targets/avida source/targets/avida-viewer source/third-party source/tools source/utils/task_events
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Mon May 22 07:15:01 PDT 2006
Author: brysonda
Date: 2006-05-22 10:15:01 -0400 (Mon, 22 May 2006)
New Revision: 698
Modified:
development/Avida.xcodeproj/project.pbxproj
development/CMakeLists.txt
development/source/CMakeLists.txt
development/source/targets/avida-viewer/CMakeLists.txt
development/source/targets/avida/CMakeLists.txt
development/source/third-party/CMakeLists.txt
development/source/tools/CMakeLists.txt
development/source/utils/task_events/CMakeLists.txt
Log:
Add in toggles for disabling serialization within CMake. This should allow for the shipping of a source package without the extra files.
Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj 2006-05-22 13:42:50 UTC (rev 697)
+++ development/Avida.xcodeproj/project.pbxproj 2006-05-22 14:15:01 UTC (rev 698)
@@ -573,6 +573,10 @@
7054A17D09A8032600038658 /* tAnalyzeJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tAnalyzeJob.h; sourceTree = "<group>"; };
7054A1B309A810CB00038658 /* cAnalyzeJobWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cAnalyzeJobWorker.h; sourceTree = "<group>"; };
7054A1B409A810CB00038658 /* cAnalyzeJobWorker.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cAnalyzeJobWorker.cc; sourceTree = "<group>"; };
+ 7057886F0A21FE8D00E85D8E /* cFixedBlock.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cFixedBlock.cc; sourceTree = "<group>"; };
+ 705788700A21FE8D00E85D8E /* cFixedCoords.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cFixedCoords.cc; sourceTree = "<group>"; };
+ 705788710A21FE8D00E85D8E /* nTemplateTests.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nTemplateTests.cc; sourceTree = "<group>"; };
+ 705788720A21FE8D00E85D8E /* nTemplateTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nTemplateTests.h; sourceTree = "<group>"; };
705ACD4C0A13FED4002D5BA0 /* PrintActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintActions.h; sourceTree = "<group>"; };
705ACD4D0A13FED4002D5BA0 /* PrintActions.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrintActions.cc; sourceTree = "<group>"; };
70658C59085DF67D00486BED /* libncurses.5.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.5.4.dylib; path = /usr/lib/libncurses.5.4.dylib; sourceTree = "<absolute>"; };
@@ -1547,6 +1551,10 @@
DCC314D8076253A2008F7A48 /* tools */ = {
isa = PBXGroup;
children = (
+ 7057886F0A21FE8D00E85D8E /* cFixedBlock.cc */,
+ 705788700A21FE8D00E85D8E /* cFixedCoords.cc */,
+ 705788710A21FE8D00E85D8E /* nTemplateTests.cc */,
+ 705788720A21FE8D00E85D8E /* nTemplateTests.h */,
700E11BC0A0815B600B604CD /* cDataEntry.cc */,
70B08B9008FB2E6B00FC65FE /* cTools.cc */,
70B08B9108FB2E6B00FC65FE /* cWeightedIndex.cc */,
Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt 2006-05-22 13:42:50 UTC (rev 697)
+++ development/CMakeLists.txt 2006-05-22 14:15:01 UTC (rev 698)
@@ -38,6 +38,15 @@
SET(AVD_ENABLE_TCMALLOC FALSE)
ENDIF(UNIX)
+IF(EXISTS ${PROJECT_SOURCE_DIR}/source/archive)
+ OPTION(AVD_SERIALIZATION
+ "Enable boost serialization support"
+ OFF
+ )
+ELSE(EXISTS ${PROJECT_SOURCE_DIR}/source/archive)
+ SET(AVD_SERIALIZATION FALSE)
+ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/source/archive)
+
# Experimental Boost.Python interface to avida is disabled by default.
OPTION(AVD_PY_BINDINGS
"Enable Python interface to Avida. (EXPERIMENTAL)"
@@ -116,7 +125,6 @@
"Where can the Avida executable 'avida' be found ?"
FORCE
)
- SET(BUILD_TESTING TRUE)
ENABLE_TESTING()
SET(AVD_CONSISTENCY_CHECK_PRIMITIVE
ON CACHE INTERNAL
@@ -125,7 +133,7 @@
)
ELSE(EXISTS ${PROJECT_SOURCE_DIR}/consistencytests)
MESSAGE(SEND_ERROR
- "The option AVD_CONSISTENCY_TEST_PRIMITIVE is enabled but I can't find the consistency test suites. They should be in the subdirectory ${PROJECT_SOURCE_DIR}/consistencytests; if you want to enable AVD_CONSISTENCY_TEST_PRIMITIVE, cd into ${PROJECT_SOURCE_DIR} and then check-out the 'consistencytests' project from cvs on rodan (ask kaben for help if you need it)."
+ "The option AVD_CONSISTENCY_TEST_PRIMITIVE is enabled but I can't find the consistency test suites. They should be in the subdirectory ${PROJECT_SOURCE_DIR}/consistencytests"
)
ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/consistencytests)
IF(AVD_CONSISTENCY_CHECK_PRIMITIVE)
@@ -152,7 +160,7 @@
)
IF(AVD_UNIT_TESTS)
SET(UNIT_TESTS TRUE)
- SET(BUILD_TESTING TRUE)
+ INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
ADD_DEFINITIONS(-DENABLE_UNIT_TESTS)
ADD_DEFINITIONS(-DUSE_tMemTrack=1)
ENABLE_TESTING()
@@ -161,10 +169,6 @@
REMOVE_DEFINITIONS(-DUSE_tMemTrack=1)
ENDIF(AVD_UNIT_TESTS)
-IF(BUILD_TESTING)
- INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
-ENDIF(BUILD_TESTING)
-
IF(MSVC)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/platform/win32-pthread)
ENDIF(MSVC)
Modified: development/source/CMakeLists.txt
===================================================================
--- development/source/CMakeLists.txt 2006-05-22 13:42:50 UTC (rev 697)
+++ development/source/CMakeLists.txt 2006-05-22 14:15:01 UTC (rev 698)
@@ -1,5 +1,8 @@
-SUBDIRS(actions analyze archive classification cpu drivers event main platform targets third-party tools utils/task_events)
+SUBDIRS(actions analyze classification cpu drivers event main platform targets third-party tools utils/task_events)
+IF(AVD_SERIALIZATION)
+ SUBDIRS(archive)
+ENDIF(AVD_SERIALIZATION)
IF(AVD_PY_BINDINGS)
SUBDIRS(bindings python)
ENDIF(AVD_PY_BINDINGS)
Modified: development/source/targets/avida/CMakeLists.txt
===================================================================
--- development/source/targets/avida/CMakeLists.txt 2006-05-22 13:42:50 UTC (rev 697)
+++ development/source/targets/avida/CMakeLists.txt 2006-05-22 14:15:01 UTC (rev 698)
@@ -18,9 +18,11 @@
)
ENDIF(AVD_ENABLE_TCMALLOC)
-SET(avida_target_link_libs
- ${avida_target_link_libs} archive boost_serialization
-)
+IF(AVD_SERIALIZATION)
+ SET(avida_target_link_libs
+ ${avida_target_link_libs} archive boost_serialization
+ )
+ENDIF(AVD_SERIALIZATION)
SET(avida_target_link_libs
${avida_target_link_libs} main
Modified: development/source/targets/avida-viewer/CMakeLists.txt
===================================================================
--- development/source/targets/avida-viewer/CMakeLists.txt 2006-05-22 13:42:50 UTC (rev 697)
+++ development/source/targets/avida-viewer/CMakeLists.txt 2006-05-22 14:15:01 UTC (rev 698)
@@ -42,9 +42,11 @@
)
ENDIF(AVD_ENABLE_TCMALLOC)
-SET(avida_viewer_target_link_libs
- ${avida_viewer_target_link_libs} archive boost_serialization
-)
+IF(AVD_SERIALIZATION)
+ SET(avida_viewer_target_link_libs
+ ${avida_viewer_target_link_libs} archive boost_serialization
+ )
+ENDIF(AVD_SERIALIZATION)
SET(avida_viewer_target_link_libs
${avida_viewer_target_link_libs} main
Modified: development/source/third-party/CMakeLists.txt
===================================================================
--- development/source/third-party/CMakeLists.txt 2006-05-22 13:42:50 UTC (rev 697)
+++ development/source/third-party/CMakeLists.txt 2006-05-22 14:15:01 UTC (rev 698)
@@ -1,4 +1,6 @@
-SUBDIRS(boost/serialization)
+IF(AVD_SERIALIZATION)
+ SUBDIRS(boost/serialization)
+ENDIF(AVD_SERIALIZATION)
IF(AVD_GUI_NCURSES)
SUBDIRS(trio)
Modified: development/source/tools/CMakeLists.txt
===================================================================
--- development/source/tools/CMakeLists.txt 2006-05-22 13:42:50 UTC (rev 697)
+++ development/source/tools/CMakeLists.txt 2006-05-22 14:15:01 UTC (rev 698)
@@ -1,5 +1,4 @@
SET(libtools_a_SOURCES
- #cBlockStruct.cc
cChangeList.cc
cConstSchedule.cc
cDataEntry.cc
@@ -9,7 +8,6 @@
cDefaultMessageDisplay.cc
cDoubleSum.cc
cFile.cc
- #cFixedBlock.cc
cFixedCoords.cc
cHelpAlias.cc
cHelpManager.cc
@@ -34,14 +32,12 @@
cTools.cc
cWeightedIndex.cc
cCycleCheck.cc
- nTemplateTests.cc
)
+IF(AVD_SERIALIZATION)
+ SET(libtools_a_SOURCES ${libtools_a_SOURCES} nTemplateTests.cc)
+ENDIF(AVD_SERIALIZATION)
+
INCLUDE_DIRECTORIES(${ALL_INC_DIRS})
ADD_LIBRARY(tools ${libtools_a_SOURCES})
-
-IF(BUILD_TESTING)
- #SUBDIRS(tests)
-ENDIF(BUILD_TESTING)
-
Modified: development/source/utils/task_events/CMakeLists.txt
===================================================================
--- development/source/utils/task_events/CMakeLists.txt 2006-05-22 13:42:50 UTC (rev 697)
+++ development/source/utils/task_events/CMakeLists.txt 2006-05-22 14:15:01 UTC (rev 698)
@@ -1,7 +1,11 @@
INCLUDE_DIRECTORIES(${ALL_INC_DIRS})
ADD_EXECUTABLE(task_event_gen task_event_gen.cc)
-TARGET_LINK_LIBRARIES(task_event_gen tools archive boost_serialization)
+SET(task_event_gen_link_libraries tools)
+IF(AVD_SERIALIZATION)
+ SET(task_event_gen_link_libraries ${task_event_gen_link_libraries} archive boost_serialization)
+ENDIF(AVD_SERIALIZATION)
+TARGET_LINK_LIBRARIES(task_event_gen ${task_event_gen_link_libraries})
LINK_DIRECTORIES(${ALL_LIB_DIRS})
INSTALL_TARGETS(/work task_event_gen)
More information about the Avida-cvs
mailing list