[Avida-cvs] [avida-svn] r975 - in trunk: . Avida.xcodeproj

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2006-09-23 21:38:17 -0400 (Sat, 23 Sep 2006)
New Revision: 975

Modified:
   trunk/Avida.xcodeproj/project.pbxproj
   trunk/CMakeLists.txt
Log:
Change trunk CMake defaults.   Build viewer, turn off consistency tests.

Modified: trunk/Avida.xcodeproj/project.pbxproj
===================================================================
--- trunk/Avida.xcodeproj/project.pbxproj	2006-09-23 17:46:02 UTC (rev 974)
+++ trunk/Avida.xcodeproj/project.pbxproj	2006-09-24 01:38:17 UTC (rev 975)
@@ -302,7 +302,7 @@
 		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; };
+		700E2B83085DE50C00CF158A /* avida-viewer */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = "avida-viewer"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7013845F09028B3E0087ED2E /* cAvidaConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cAvidaConfig.h; sourceTree = "<group>"; };
 		7013846009028B3E0087ED2E /* cAvidaConfig.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cAvidaConfig.cc; sourceTree = "<group>"; };
 		701384A10902A16F0087ED2E /* defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2006-09-23 17:46:02 UTC (rev 974)
+++ trunk/CMakeLists.txt	2006-09-24 01:38:17 UTC (rev 975)
@@ -157,7 +157,7 @@
 # By default, build the console interface to Avida.
 OPTION(AVD_GUI_NCURSES
   "Enable building Avida console interface."
-  OFF
+  ON
 )
 # Make sure requisites are present for build of console interface.  Give
 # user feedback if they're missing.
@@ -187,7 +187,7 @@
 	# are run via 'make test' under unix.
 	OPTION(AVD_CONSISTENCY_TEST_PRIMITIVE
 		"Enable primitive consistency test suites."
-		ON
+		OFF
 	)
 	IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
 		IF(EXISTS ${PROJECT_SOURCE_DIR}/consistencytests)