[geos-commits] r3116 - in trunk: . tests/unit

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-10-15 08:54:14 -0700 (Fri, 15 Oct 2010)
New Revision: 3116

Modified:
   trunk/CMakeLists.txt
   trunk/tests/unit/CMakeLists.txt
Log:
Unified CMAKE_*_OUTPUT_DIRECTOR locations to simplify tests running and finding all binaries.

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2010-10-15 15:20:02 UTC (rev 3115)
+++ trunk/CMakeLists.txt	2010-10-15 15:54:14 UTC (rev 3116)
@@ -204,6 +204,18 @@
 endif()
 
 ################################################################################
+# Setup build directories
+#################################################################################
+
+# Put the libaries and binaries that get built into directories at the
+# top of the build tree rather than in hard-to-find leaf
+# directories. This simplifies manual testing and the use of the build
+# tree rather than installed Boost libraries.
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+################################################################################
 # Setup include directories
 #################################################################################
 

Modified: trunk/tests/unit/CMakeLists.txt
===================================================================
--- trunk/tests/unit/CMakeLists.txt	2010-10-15 15:20:02 UTC (rev 3115)
+++ trunk/tests/unit/CMakeLists.txt	2010-10-15 15:54:14 UTC (rev 3116)
@@ -25,9 +25,9 @@
   add_executable(geos_unit ${geos_unit_SOURCES})
   target_link_libraries(geos_unit geos geos_c)
 
-  add_test(geos_unit ${CMAKE_CURRENT_BINARY_DIR}/geos_unit)
+  add_test(geos_unit ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/geos_unit)
 
   set(STATUS_RESULT "ON")
 endif()
 
-message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
\ No newline at end of file
+message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")