[geos-commits] r3382 - in trunk/tests: bigtest unit xmltester

[svn_geos at osgeo.org]

Author: mloskot
Date: 2011-05-30 02:41:41 -0700 (Mon, 30 May 2011)
New Revision: 3382

Modified:
   trunk/tests/bigtest/CMakeLists.txt
   trunk/tests/unit/CMakeLists.txt
   trunk/tests/xmltester/CMakeLists.txt
Log:
Applied supplementary tests.patch for 85 from William

Modified: trunk/tests/bigtest/CMakeLists.txt
===================================================================
--- trunk/tests/bigtest/CMakeLists.txt	2011-05-27 14:04:18 UTC (rev 3381)
+++ trunk/tests/bigtest/CMakeLists.txt	2011-05-30 09:41:41 UTC (rev 3382)
@@ -21,13 +21,22 @@
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/io/markup)
 
   add_executable(bug234 bug234.cpp)
-  target_link_libraries(bug234 geos)
 
+  if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK) 
+    target_link_libraries(bug234 GEOS) 
+  else() 
+    target_link_libraries(bug234 geos) 
+  endif() 
+
   add_executable(TestSweepLineSpeed
 	TestSweepLineSpeed.cpp
 	GeometryTestFactory.cpp
 	bigtest.h)
-  target_link_libraries(TestSweepLineSpeed geos)
+  if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
+    target_link_libraries(TestSweepLineSpeed GEOS)
+  else()
+    target_link_libraries(TestSweepLineSpeed geos)
+  endif()
 
   add_test(bug234 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bug234)
   add_test(TestSweepLineSpeed ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestSweepLineSpeed)
@@ -35,4 +44,4 @@
   set(STATUS_RESULT "ON")
 endif()
 
-message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
\ No newline at end of file
+message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")

Modified: trunk/tests/unit/CMakeLists.txt
===================================================================
--- trunk/tests/unit/CMakeLists.txt	2011-05-27 14:04:18 UTC (rev 3381)
+++ trunk/tests/unit/CMakeLists.txt	2011-05-30 09:41:41 UTC (rev 3382)
@@ -23,7 +23,11 @@
   file(GLOB_RECURSE geos_unit_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
   
   add_executable(geos_unit ${geos_unit_SOURCES})
-  target_link_libraries(geos_unit geos geos_c)
+  if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
+    target_link_libraries(geos_unit GEOS)
+ 	else()
+    target_link_libraries(geos_unit geos geos_c)
+ 	endif()
 
   add_test(geos_unit ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/geos_unit)
 

Modified: trunk/tests/xmltester/CMakeLists.txt
===================================================================
--- trunk/tests/xmltester/CMakeLists.txt	2011-05-27 14:04:18 UTC (rev 3381)
+++ trunk/tests/xmltester/CMakeLists.txt	2011-05-30 09:41:41 UTC (rev 3382)
@@ -32,10 +32,18 @@
     SingleSidedBufferResultMatcher.cpp)
 
   add_executable(simplewkttester ${simplewkttester_SOURCES})
-  target_link_libraries(simplewkttester geos)
+  if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
+    target_link_libraries(simplewkttester GEOS)
+ 	else()
+    target_link_libraries(simplewkttester geos)
+ 	endif()
 
   add_executable(xmltester ${xmltester_SOURCES})
-  target_link_libraries(xmltester geos)
+  if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
+    target_link_libraries(xmltester GEOS)
+ 	else()
+    target_link_libraries(xmltester geos)
+  endif()
 
   set(XMLTESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests)
   set(SAVE_XMLTESTS
@@ -103,4 +111,4 @@
   set(STATUS_RESULT "ON")
 endif()
 
-message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
\ No newline at end of file
+message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")