diff --git a/CMakeLists.txt b/CMakeLists.txt index 123794edc..e09bcaf36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -355,6 +355,9 @@ ENDIF(PKG_CONFIG_FOUND) + + + # # Test to determine if we want the "tripledot" form of the GLU tesselator callback. # @@ -533,11 +536,6 @@ ELSE (DYNAMIC_OPENSCENEGRAPH) SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC") ENDIF(DYNAMIC_OPENSCENEGRAPH) -# Add a default plugin search path component -IF (DYNAMIC_OPENSCENEGRAPH) - ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS}) -ENDIF(DYNAMIC_OPENSCENEGRAPH) - INCLUDE(OsgMacroUtils) # OSG Core ADD_SUBDIRECTORY(src) diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt index 94bf2f42c..87af2ec93 100644 --- a/src/osgDB/CMakeLists.txt +++ b/src/osgDB/CMakeLists.txt @@ -1,10 +1,15 @@ IF (DYNAMIC_OPENSCENEGRAPH) ADD_DEFINITIONS(-DOSGDB_LIBRARY) + + # Add a default plugin search path component + ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS}) ELSE (DYNAMIC_OPENSCENEGRAPH) ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) ENDIF(DYNAMIC_OPENSCENEGRAPH) + + SET(LIB_NAME osgDB) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(LIB_PUBLIC_HEADERS