[Avida-SVN] r2234 - / development

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2007-12-19 15:29:24 -0500 (Wed, 19 Dec 2007)
New Revision: 2234

Modified:
   /
   development/CMakeLists.txt
Log:
 r2272 at vallista:  kaben | 2007-12-19 12:22:31 -0800
 Made it easier to find place to add new testsuites to CMakeLists.txt.
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/xcode-test:1653
c457ea80-0a68-11dc-9323-a45eea2efad5:/private:2271
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/xcode-test:1653
c457ea80-0a68-11dc-9323-a45eea2efad5:/private:2272

Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt	2007-12-19 20:29:22 UTC (rev 2233)
+++ development/CMakeLists.txt	2007-12-19 20:29:24 UTC (rev 2234)
@@ -572,21 +572,10 @@
   OFF
 )
 IF(AVD_TESTSUITES)
-  SET(TESTSUITES_DIR
-    "${PROJECT_SOURCE_DIR}/../extras/source"
-    CACHE PATH
+  SET(TESTSUITES_DIR "${PROJECT_SOURCE_DIR}/../extras/source" CACHE PATH
     "The path to testsuite files."
   )
   IF(EXISTS ${TESTSUITES_DIR})
-    INCLUDE_DIRECTORIES(${TESTSUITES_DIR}/tools)
-    SET(TESTSUITES_TOOL_SOURCES
-      ${TESTSUITES_DIR}/tools/cAnalyzeTestFixture.cpp
-      ${TESTSUITES_DIR}/tools/cConsoleCatcher.cpp
-      ${TESTSUITES_DIR}/tools/cMemTracker.cpp
-      ${TESTSUITES_DIR}/tools/cTestDriver.cpp
-      ${TESTSUITES_DIR}/tools/cTestLib.cpp
-      ${TESTSUITES_DIR}/tools/cTestSettings.cpp
-    )
     SET(TESTSUITES_SOURCES
       ${TESTSUITES_DIR}/testsuites/nAGenotype.cpp
       ${TESTSUITES_DIR}/testsuites/nAnalyze.cpp
@@ -609,9 +598,19 @@
       ${TESTSUITES_DIR}/testsuites/nTestSettings.cpp
       ${TESTSUITES_DIR}/testsuites/nTreeStats.cpp
     )
+    SET(TESTSUITES_TOOL_SOURCES
+      ${TESTSUITES_DIR}/tools/cAnalyzeTestFixture.cpp
+      ${TESTSUITES_DIR}/tools/cConsoleCatcher.cpp
+      ${TESTSUITES_DIR}/tools/cMemTracker.cpp
+      ${TESTSUITES_DIR}/tools/cTestDriver.cpp
+      ${TESTSUITES_DIR}/tools/cTestLib.cpp
+      ${TESTSUITES_DIR}/tools/cTestSettings.cpp
+    )
     SET(TESTSUITES_MAIN_SOURCES
       ${TESTSUITES_DIR}/targets/TestAvida/TestAvida.cpp
     )
+    INCLUDE_DIRECTORIES(${TESTSUITES_DIR}/tools)
+
     ADD_EXECUTABLE(testsuites ${TESTSUITES_TOOL_SOURCES} ${TESTSUITES_SOURCES} ${TESTSUITES_MAIN_SOURCES})
     INSTALL_TARGETS(/work testsuites)