From ca9c4f7ca53e00236250e27b93d1549a94f27b28 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 12 Mar 2007 21:23:09 +0000
Subject: [PATCH] Changed the lib and executable local build so that they all
 go in bin and lib respectively.

---
 CMakeLists.txt              | 7 +++++--
 applications/CMakeLists.txt | 4 ----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d757767b5..7eecfee01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,12 +152,15 @@ if (UNIX AND NOT WIN32)
   endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
 endif (UNIX AND NOT WIN32)
 
-SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
+#SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
+SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
 MAKE_DIRECTORY(${OUTPUT_BINDIR})
 SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
 
-SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
+#SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
+SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
 MAKE_DIRECTORY(${OUTPUT_LIBDIR})
+MAKE_DIRECTORY(${OUTPUT_LIBDIR}/osgPlugins)
 SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
 
 
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index f7403ae47..d5561d947 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -13,10 +13,6 @@ IF(NOT OSGCORE_BUNDLED)
 ENDIF(NOT OSGCORE_BUNDLED)
 SET(OPENSCENEGRAPH_APPLICATION_DIR ${PROJECT_SOURCE_DIR})
 
-SET(EXAMPLES_EXE_PATH ${PROJECT_BINARY_DIR}/bin)
-MAKE_DIRECTORY(${EXAMPLES_EXE_PATH})
-SET(EXECUTABLE_OUTPUT_PATH ${EXAMPLES_EXE_PATH})
-
 INCLUDE(OsgMacroUtils)