[osg-submissions] osg-ppu fixes

Bob Kuehne Mon, 30 Jun 2008 08:01:38 -0700

hi all, cross-posting to osg-submissions so that this gets more visibility than just mailing to art (cc'd on this). here's how i fixed PPU to work with the new birfucated osg/include header structure. three changes to a FindOSG.cmake module, and then to the parent CMakeLists.txt which uses that to setup include paths.

the attached files go into the following spots within the ppu distribution, where 'osgPPU' is the root of the PPU tree:


 CMakeLists.txt -> osgPPU/CMakeLists.txt
 FindOSG.cmake  -> osgPPU/CMakeModules/FindOSG.cmake

finally, art, you can remove FindOpenThreads.cmake from the CMakeModules directory.


thanks,
bob

CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)

PROJECT(osgPPU)

SET(CMAKE_MODULE_PATH "${osgPPU_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
SET(SOURCE_DIR ${osgPPU_SOURCE_DIR})
SET(OSG_DIR "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Path where to find the osg 
installation")


#######################################
# Dynamic vs Static Linking
#######################################
OPTION(DYNAMIC_OSGPPU "Set to ON to build osgPPU for dynamic linking.  Use OFF 
for static." ON)
IF (DYNAMIC_OSGPPU)
    SET(OSGPPU_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
ELSE (DYNAMIC_OSGPPU)
    SET(OSGPPU_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
    SET(CMAKE_MODULE_CXX_FLAGS_DEBUG "-pthread")
ENDIF(DYNAMIC_OSGPPU)


#######################################
# Library files
#######################################
FIND_PACKAGE( OpenGL REQUIRED )
FIND_PACKAGE( OSG REQUIRED )

INCLUDE_DIRECTORIES(BEFORE
    ${OPENGL_INCLUDE_DIR}
    ${OSG_INCLUDE_DIRS}
    ${SOURCE_DIR}/include 
)

SET(GL_LIBS 
  ${OPENGL_gl_LIBRARY} 
  ${OPENGL_glu_LIBRARY}
)

# MESSAGE( "project path: ${PROJECT_BINARY_DIR}" )
# MESSAGE( "source  path: ${osgPPU_SOURCE_DIR}" )

#######################################
# Solution definition
#######################################
IF(WIN32)
    ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
    ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
    ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)

    IF(MSVC)
        OPTION(OSGPPU_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build without 
incremental linking in debug (release is off by default)" OFF)
        IF(NOT OSGPPU_MSVC_DEBUG_INCREMENTAL_LINK)
            SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
            SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
            SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
        ENDIF(NOT OSGPPU_MSVC_DEBUG_INCREMENTAL_LINK)
    ENDIF(MSVC)
ENDIF(WIN32)



#Solution
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})


INCLUDE(OsgPPUMacroUtils)


################################################################################
# Some usefull definition
################################################################################
DETECT_OSG_VERSION()
#OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float 
Matrix instead of double." OFF)
#MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
#IF(OSG_USE_FLOAT_MATRIX)        
#    ADD_DEFINITIONS(-DOSG_USE_FLOAT_MATRIX)
#ENDIF(OSG_USE_FLOAT_MATRIX)        

#OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float Plane 
instead of double." OFF)
#MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE)
#IF(OSG_USE_FLOAT_PLANE)        
#    ADD_DEFINITIONS(-DOSG_USE_FLOAT_PLANE)
#ENDIF(OSG_USE_FLOAT_PLANE)        

#OPTION(OSG_USE_FLOAT_BOUNDINGSPHERE "Set to ON to build OpenSceneGraph with 
float BoundingSphere instead of double." ON)
#MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
#IF(NOT OSG_USE_FLOAT_BOUNDINGSPHERE)        
#    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGSPHERE)
#ENDIF(NOT OSG_USE_FLOAT_BOUNDINGSPHERE)        

#OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float 
BoundingBox instead of double." ON)
#MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
#IF(NOT OSG_USE_FLOAT_BOUNDINGBOX)      
#    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGBOX)
#ENDIF(NOT OSG_USE_FLOAT_BOUNDINGBOX)        
################################################################################


################################################################################
# Create bin and lib directories if required
################################################################################
#IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
#   FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib 
${CMAKE_BINARY_DIR}/lib/${OSG_PLUGINS})
#ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")


################################################################################
# Compile subdirectory
################################################################################
ADD_SUBDIRECTORY(src)


################################################################################
### uninstall target
################################################################################
CONFIGURE_FILE(
  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
  IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET(uninstall
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

FindOSG.cmake
Description: Binary data

_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org

[osg-submissions] osg-ppu fixes

Reply via email to