Changed the lib and executable local build so that they all go in bin and lib respectively.

This commit is contained in:
Robert Osfield 2007-03-12 21:23:09 +00:00
parent e5a9364577
commit ca9c4f7ca5
2 changed files with 5 additions and 6 deletions

View File

@ -152,12 +152,15 @@ if (UNIX AND NOT WIN32)
endif (CMAKE_SIZEOF_VOID_P MATCHES "8") endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
endif (UNIX AND NOT WIN32) 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}) MAKE_DIRECTORY(${OUTPUT_BINDIR})
SET(EXECUTABLE_OUTPUT_PATH ${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})
MAKE_DIRECTORY(${OUTPUT_LIBDIR}/osgPlugins)
SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR}) SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})

View File

@ -13,10 +13,6 @@ IF(NOT OSGCORE_BUNDLED)
ENDIF(NOT OSGCORE_BUNDLED) ENDIF(NOT OSGCORE_BUNDLED)
SET(OPENSCENEGRAPH_APPLICATION_DIR ${PROJECT_SOURCE_DIR}) 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) INCLUDE(OsgMacroUtils)