Changeset 6349

Show
Ignore:
Timestamp:
03/12/07 22:23:09
Author:
robert
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/CMakeLists.txt

    r6330 r6349  
    153153endif (UNIX AND NOT WIN32) 
    154154 
    155 SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME}) 
     155#SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME}) 
     156SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin) 
    156157MAKE_DIRECTORY(${OUTPUT_BINDIR}) 
    157158SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR}) 
    158159 
    159 SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME}) 
     160#SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME}) 
     161SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib) 
    160162MAKE_DIRECTORY(${OUTPUT_LIBDIR}) 
     163MAKE_DIRECTORY(${OUTPUT_LIBDIR}/osgPlugins) 
    161164SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR}) 
    162165 

  • OpenSceneGraph/trunk/applications/CMakeLists.txt

    r6327 r6349  
    1313ENDIF(NOT OSGCORE_BUNDLED) 
    1414SET(OPENSCENEGRAPH_APPLICATION_DIR ${PROJECT_SOURCE_DIR}) 
    15  
    16 SET(EXAMPLES_EXE_PATH ${PROJECT_BINARY_DIR}/bin) 
    17 MAKE_DIRECTORY(${EXAMPLES_EXE_PATH}) 
    18 SET(EXECUTABLE_OUTPUT_PATH ${EXAMPLES_EXE_PATH}) 
    1915 
    2016INCLUDE(OsgMacroUtils)