[Avida-cvs] [avida-svn] r643 - in development: . Avida.xcodeproj notes source source/platform source/platform/tcmalloc source/targets/avida
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Wed May 3 17:16:15 PDT 2006
Author: brysonda
Date: 2006-05-03 20:16:15 -0400 (Wed, 03 May 2006)
New Revision: 643
Added:
development/source/platform/CMakeLists.txt
development/source/platform/tcmalloc/CMakeLists.txt
Modified:
development/Avida.xcodeproj/project.pbxproj
development/CMakeLists.txt
development/notes/release-milestones.txt
development/source/CMakeLists.txt
development/source/targets/avida/CMakeLists.txt
Log:
Add tcmalloc to the cmake build system. Currently only enabled under OS X builds of 'avida' (primitive).
Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj 2006-05-03 23:41:15 UTC (rev 642)
+++ development/Avida.xcodeproj/project.pbxproj 2006-05-04 00:16:15 UTC (rev 643)
@@ -494,6 +494,8 @@
700E11BC0A0815B600B604CD /* cDataEntry.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cDataEntry.cc; sourceTree = "<group>"; };
700E123F0A084D3D00B604CD /* cTemplateTests.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTemplateTests.cc; sourceTree = "<group>"; };
700E12400A084D3D00B604CD /* cTemplateTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cTemplateTests.h; sourceTree = "<group>"; };
+ 700E12610A097A0800B604CD /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+ 700E12630A097A1700B604CD /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
700E28CF0859FFD700CF158A /* tObjectFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tObjectFactory.h; sourceTree = "<group>"; };
700E2B83085DE50C00CF158A /* avida-viewer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "avida-viewer"; sourceTree = BUILT_PRODUCTS_DIR; };
7013845F09028B3E0087ED2E /* cAvidaConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cAvidaConfig.h; sourceTree = "<group>"; };
@@ -1209,6 +1211,7 @@
70DCF4FF09CF81E400924128 /* platform */ = {
isa = PBXGroup;
children = (
+ 700E12610A097A0800B604CD /* CMakeLists.txt */,
70DCF50009CF823500924128 /* tcmalloc */,
);
path = platform;
@@ -1217,6 +1220,7 @@
70DCF50009CF823500924128 /* tcmalloc */ = {
isa = PBXGroup;
children = (
+ 700E12630A097A1700B604CD /* CMakeLists.txt */,
70DCF57F09CFBD3D00924128 /* tcmalloc-logging.cc */,
70DCF58009CFBD3D00924128 /* tcmalloc-logging.h */,
70DCF50109CFB0B400924128 /* system-alloc.h */,
Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt 2006-05-03 23:41:15 UTC (rev 642)
+++ development/CMakeLists.txt 2006-05-04 00:16:15 UTC (rev 643)
@@ -32,6 +32,12 @@
"Built libraries are placed here before installation."
)
+IF(APPLE)
+ SET(AVD_ENABLE_TCMALLOC TRUE)
+ELSE(APPLE)
+ SET(AVD_ENABLE_TCMALLOC FALSE)
+ENDIF(APPLE)
+
# Experimental Boost.Python interface to avida is disabled by default.
OPTION(AVD_PY_BINDINGS
"Enable Python interface to Avida. (EXPERIMENTAL)"
Modified: development/notes/release-milestones.txt
===================================================================
--- development/notes/release-milestones.txt 2006-05-03 23:41:15 UTC (rev 642)
+++ development/notes/release-milestones.txt 2006-05-04 00:16:15 UTC (rev 643)
@@ -47,7 +47,7 @@
* Improved driver object framework
* SMT Hardware
+ Basic multithreaded analyze mode support
-+ TCMalloc OS X
+* TCMalloc OS X
- TCMalloc Linux
* Actions framework
+ Merge (meaningful) events and analyze commands into actions framework
Modified: development/source/CMakeLists.txt
===================================================================
--- development/source/CMakeLists.txt 2006-05-03 23:41:15 UTC (rev 642)
+++ development/source/CMakeLists.txt 2006-05-04 00:16:15 UTC (rev 643)
@@ -1,5 +1,5 @@
-SUBDIRS(actions analyze archive classification cpu drivers event main targets third-party tools utils/task_events)
+SUBDIRS(actions analyze archive classification cpu drivers event main platform targets third-party tools utils/task_events)
IF(AVD_PY_BINDINGS)
SUBDIRS(bindings python)
ENDIF(AVD_PY_BINDINGS)
Added: development/source/platform/CMakeLists.txt
===================================================================
--- development/source/platform/CMakeLists.txt 2006-05-03 23:41:15 UTC (rev 642)
+++ development/source/platform/CMakeLists.txt 2006-05-04 00:16:15 UTC (rev 643)
@@ -0,0 +1,3 @@
+IF(AVD_ENABLE_TCMALLOC)
+ SUBDIRS(tcmalloc)
+ENDIF(AVD_ENABLE_TCMALLOC)
Added: development/source/platform/tcmalloc/CMakeLists.txt
===================================================================
--- development/source/platform/tcmalloc/CMakeLists.txt 2006-05-03 23:41:15 UTC (rev 642)
+++ development/source/platform/tcmalloc/CMakeLists.txt 2006-05-04 00:16:15 UTC (rev 643)
@@ -0,0 +1,8 @@
+
+SET(tcmalloc_SOURCES
+ system-alloc.cc
+ tcmalloc-logging.cc
+ tcmalloc.cc
+)
+
+ADD_LIBRARY(tcmalloc ${tcmalloc_SOURCES})
Modified: development/source/targets/avida/CMakeLists.txt
===================================================================
--- development/source/targets/avida/CMakeLists.txt 2006-05-03 23:41:15 UTC (rev 642)
+++ development/source/targets/avida/CMakeLists.txt 2006-05-04 00:16:15 UTC (rev 643)
@@ -1,10 +1,31 @@
INCLUDE_DIRECTORIES(${ALL_INC_DIRS})
ADD_EXECUTABLE(avida primitive.cc)
-IF(MSVC)
- TARGET_LINK_LIBRARIES(avida main classification cpu event analyze drivers analyze cpu tools actions main archive boost_serialization)
-ELSE(MSVC)
- TARGET_LINK_LIBRARIES(avida main classification cpu event analyze drivers analyze cpu tools actions pthread main archive boost_serialization)
-ENDIF(MSVC)
+
+SET(avida_target_link_libs
+ main classification cpu event analyze drivers analyze cpu tools actions
+)
+
+IF(NOT MSVC)
+ SET(avida_target_link_libs
+ ${avida_target_link_libs} pthread
+ )
+ENDIF(NOT MSVC)
+
+IF(AVD_ENABLE_TCMALLOC)
+ SET(avida_target_link_libs
+ ${avida_target_link_libs} tcmalloc
+ )
+ENDIF(AVD_ENABLE_TCMALLOC)
+
+SET(avida_target_link_libs
+ ${avida_target_link_libs} archive boost_serialization
+)
+
+SET(avida_target_link_libs
+ ${avida_target_link_libs} main
+)
+
+TARGET_LINK_LIBRARIES(avida ${avida_target_link_libs})
LINK_DIRECTORIES(${ALL_LIB_DIRS})
INSTALL_TARGETS(/work avida)
More information about the Avida-cvs
mailing list