[Avida-SVN] r1760 - development

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-07-07 11:28:44 -0400 (Sat, 07 Jul 2007)
New Revision: 1760

Modified:
   development/CMakeLists.txt
Log:
Revert CMakeLists.txt changes for now. Need to add in Mac OS detection, leaving out pthread as it is not needed and causes problems with the new viewer.

Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt	2007-07-07 06:10:05 UTC (rev 1759)
+++ development/CMakeLists.txt	2007-07-07 15:28:44 UTC (rev 1760)
@@ -318,6 +318,9 @@
   ADD_EXECUTABLE(avida ${AVIDA_CMDLINE_SOURCES})
 
   SET(AVIDA_CMDLINE_LIBS avidacore)  
+  IF(NOT MSVC)
+    LIST(APPEND AVIDA_CMDLINE_LIBS pthread)
+  ENDIF(NOT MSVC)
   IF(AVD_ENABLE_TCMALLOC)
     LIST(APPEND AVIDA_CMDLINE_LIBS tcmalloc)
   ENDIF(AVD_ENABLE_TCMALLOC)  
@@ -375,6 +378,9 @@
     ADD_EXECUTABLE(avida-viewer ${AVIDA_VIEWER_SOURCES})
     
     SET(AVIDA_VIEWER_LIBS avidacore ${NCURSES_LIBRARY})
+    IF(NOT MSVC)
+      LIST(APPEND AVIDA_VIEWER_LIBS pthread)
+    ENDIF(NOT MSVC)
     IF(AVD_ENABLE_TCMALLOC)
       LIST(APPEND AVIDA_VIEWER_LIBS tcmalloc)
     ENDIF(AVD_ENABLE_TCMALLOC)
@@ -433,14 +439,13 @@
     SOURCE_GROUP(targets\\viewer-text FILES ${AVIDA_TEXT_VIEWER_SOURCES})
     ADD_EXECUTABLE(avida-textview ${AVIDA_TEXT_VIEWER_SOURCES})
     
-    SET(AVIDA_TEXT_VIEWER_LIBS avidacore)
+    SET(AVIDA_TEXT_VIEWER_LIBS avidacore ${NCURSES_LIBRARY})
     IF(NOT MSVC)
       LIST(APPEND AVIDA_TEXT_VIEWER_LIBS pthread)
     ENDIF(NOT MSVC)
     IF(AVD_ENABLE_TCMALLOC)
       LIST(APPEND AVIDA_TEXT_VIEWER_LIBS tcmalloc)
     ENDIF(AVD_ENABLE_TCMALLOC)
-    LIST(APPEND AVIDA_TEXT_VIEWER_LIBS ${NCURSES_LIBRARY})
     TARGET_LINK_LIBRARIES(avida-textview ${AVIDA_TEXT_VIEWER_LIBS})
     
     INSTALL_TARGETS(/work avida-textview)
@@ -482,6 +487,9 @@
     ADD_EXECUTABLE(avida-fltkview ${AVIDA_FLTK_VIEWER_SOURCES})
     
     SET(AVIDA_FLTK_VIEWER_LIBS avidacore ${FLTK_BASE_LIBRARY})
+    IF(NOT MSVC)
+      LIST(APPEND AVIDA_FLTK_VIEWER_LIBS pthread)
+    ENDIF(NOT MSVC)
     IF(AVD_ENABLE_TCMALLOC)
       LIST(APPEND AVIDA_FLTK_VIEWER_LIBS tcmalloc)
     ENDIF(AVD_ENABLE_TCMALLOC)