[Avida-cvs] [Avida2-svn] r205 - in branches/brysonda/source: cpu event viewers

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2005-06-13 11:28:04 -0400 (Mon, 13 Jun 2005)
New Revision: 205

Modified:
   branches/brysonda/source/cpu/CMakeLists.txt
   branches/brysonda/source/event/CMakeLists.txt
   branches/brysonda/source/viewers/symbol_util.cc
Log:
Keep CMake build system current

Modified: branches/brysonda/source/cpu/CMakeLists.txt
===================================================================
--- branches/brysonda/source/cpu/CMakeLists.txt	2005-06-13 15:05:19 UTC (rev 204)
+++ branches/brysonda/source/cpu/CMakeLists.txt	2005-06-13 15:28:04 UTC (rev 205)
@@ -1,7 +1,5 @@
 SET(libcpu_a_SOURCES
-  4stack_head.cc
   code_label.cc
-  cpu_head.cc
   cpu_memory.cc
   cpu_stack.cc
   cpu_test_info.cc
@@ -11,8 +9,12 @@
   hardware_cpu.cc
   hardware_cpu_thread.cc
   hardware_factory.cc
+  hardware_smt.cc
+  hardware_smt_thread.cc
+  hardware_status_printer.cc
   hardware_util.cc
-  hardware_status_printer.cc
+  head_cpu.cc
+  head_multi_mem.cc
   memory_flags.cc
   test_cpu.cc
   test_util.cc

Modified: branches/brysonda/source/event/CMakeLists.txt
===================================================================
--- branches/brysonda/source/event/CMakeLists.txt	2005-06-13 15:05:19 UTC (rev 204)
+++ branches/brysonda/source/event/CMakeLists.txt	2005-06-13 15:28:04 UTC (rev 205)
@@ -1,43 +1,11 @@
-ADD_CUSTOM_COMMAND(
-  OUTPUT
-    cPopulation_construct_event_auto.ci
-    cPopulation_descr.ci
-    cPopulation_descr.hi
-    cPopulation_enums_auto.ci
-    cPopulation_name2enum_auto.ci
-    cPopulation_process_auto.ci
-  COMMAND perl
-  ARGS
-    ${PROJECT_SOURCE_DIR}/source/event/make_events.pl
-    ${PROJECT_SOURCE_DIR}/source/event/cPopulation
-  MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/source/event/cPopulation.events
-  COMMENT
-    This is a somewhat ugly hack to build the autogenerated code.
-    We pretend that the autogenerated code is actually a program, then
-    make builds it correctly. Any other way leads to unnecessary 
-    recompilation of libevent.a even if nothing has changed.
-)
-
 SET(libevent_a_SOURCES
-  event.cc
-  event_factory.cc
   event_factory_manager.cc
   event_list.cc
-  event_list_entry.cc
   event_list_iterator.cc
   event_triggers.cc
-  population_event.cc
   population_event_factory.cc
 )
 
-SET_SOURCE_FILES_PROPERTIES(population_event_factory.cc
-  PROPERTIES
-    OBJECT_DEPENDS cPopulation_construct_event_auto.ci
-    OBJECT_DEPENDS cPopulation_enums_auto.ci
-    OBJECT_DEPENDS cPopulation_name2enum_auto.ci
-    OBJECT_DEPENDS cPopulation_process_auto.ci
-)
-
 INCLUDE_DIRECTORIES(${ALL_INC_DIRS})
 
 ADD_LIBRARY(event ${libevent_a_SOURCES})

Modified: branches/brysonda/source/viewers/symbol_util.cc
===================================================================
--- branches/brysonda/source/viewers/symbol_util.cc	2005-06-13 15:05:19 UTC (rev 204)
+++ branches/brysonda/source/viewers/symbol_util.cc	2005-06-13 15:28:04 UTC (rev 205)
@@ -17,6 +17,7 @@
 #include "hardware_base.hh"
 #include "hardware_4stack.hh"
 #include "hardware_cpu.hh"
+#include "hardware_smt.h"
 
 using namespace std;