Skip to content
Snippets Groups Projects
Commit 844c66d7 authored by Lars Bilke's avatar Lars Bilke
Browse files

Added necessary define when using GLUT.

parent 718c486d
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,9 @@ MACRO(USE_OPENSG targetName) ...@@ -39,6 +39,9 @@ MACRO(USE_OPENSG targetName)
) )
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4231 /wd4275") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4231 /wd4275")
ENDIF (MSVC) ENDIF (MSVC)
IF(OpenSG_OSGWINDOWGLUT_LIBRARY)
ADD_DEFINITIONS(-DOSG_WITH_GLUT)
ENDIF()
TARGET_LINK_LIBRARIES( ${targetName} ${OpenSG_LIBRARIES} ) TARGET_LINK_LIBRARIES( ${targetName} ${OpenSG_LIBRARIES} )
INCLUDE_DIRECTORIES( ${OpenSG_INCLUDE_DIRS} ) INCLUDE_DIRECTORIES( ${OpenSG_INCLUDE_DIRS} )
ENDMACRO() ENDMACRO()
...@@ -86,28 +89,28 @@ MACRO(__OpenSG_ADJUST_LIB_VARS basename) ...@@ -86,28 +89,28 @@ MACRO(__OpenSG_ADJUST_LIB_VARS basename)
SET(OpenSG_${basename}_LIBRARIES optimized ${OpenSG_${basename}_LIBRARY_RELEASE} debug ${OpenSG_${basename}_LIBRARY_DEBUG}) SET(OpenSG_${basename}_LIBRARIES optimized ${OpenSG_${basename}_LIBRARY_RELEASE} debug ${OpenSG_${basename}_LIBRARY_DEBUG})
ENDIF(OpenSG_${basename}_LIBRARY_DEBUG AND OpenSG_${basename}_LIBRARY_RELEASE) ENDIF(OpenSG_${basename}_LIBRARY_DEBUG AND OpenSG_${basename}_LIBRARY_RELEASE)
# if only the release version was found, set the debug variable also to the release version # if only the release version was found, set the debug variable also to the release version
IF(OpenSG_${basename}_LIBRARY_RELEASE AND NOT OpenSG_${basename}_LIBRARY_DEBUG) IF(OpenSG_${basename}_LIBRARY_RELEASE AND NOT OpenSG_${basename}_LIBRARY_DEBUG)
SET(OpenSG_${basename}_LIBRARY_DEBUG ${OpenSG_${basename}_LIBRARY_RELEASE}) SET(OpenSG_${basename}_LIBRARY_DEBUG ${OpenSG_${basename}_LIBRARY_RELEASE})
SET(OpenSG_${basename}_LIBRARY ${OpenSG_${basename}_LIBRARY_RELEASE}) SET(OpenSG_${basename}_LIBRARY ${OpenSG_${basename}_LIBRARY_RELEASE})
SET(OpenSG_${basename}_LIBRARIES ${OpenSG_${basename}_LIBRARY_RELEASE}) SET(OpenSG_${basename}_LIBRARIES ${OpenSG_${basename}_LIBRARY_RELEASE})
ENDIF(OpenSG_${basename}_LIBRARY_RELEASE AND NOT OpenSG_${basename}_LIBRARY_DEBUG) ENDIF(OpenSG_${basename}_LIBRARY_RELEASE AND NOT OpenSG_${basename}_LIBRARY_DEBUG)
# if only the debug version was found, set the release variable also to the debug version # if only the debug version was found, set the release variable also to the debug version
IF(OpenSG_${basename}_LIBRARY_DEBUG AND NOT OpenSG_${basename}_LIBRARY_RELEASE) IF(OpenSG_${basename}_LIBRARY_DEBUG AND NOT OpenSG_${basename}_LIBRARY_RELEASE)
SET(OpenSG_${basename}_LIBRARY_RELEASE ${OpenSG_${basename}_LIBRARY_DEBUG}) SET(OpenSG_${basename}_LIBRARY_RELEASE ${OpenSG_${basename}_LIBRARY_DEBUG})
SET(OpenSG_${basename}_LIBRARY ${OpenSG_${basename}_LIBRARY_DEBUG}) SET(OpenSG_${basename}_LIBRARY ${OpenSG_${basename}_LIBRARY_DEBUG})
SET(OpenSG_${basename}_LIBRARIES ${OpenSG_${basename}_LIBRARY_DEBUG}) SET(OpenSG_${basename}_LIBRARIES ${OpenSG_${basename}_LIBRARY_DEBUG})
ENDIF(OpenSG_${basename}_LIBRARY_DEBUG AND NOT OpenSG_${basename}_LIBRARY_RELEASE) ENDIF(OpenSG_${basename}_LIBRARY_DEBUG AND NOT OpenSG_${basename}_LIBRARY_RELEASE)
IF(OpenSG_${basename}_LIBRARY) IF(OpenSG_${basename}_LIBRARY)
SET(OpenSG_${basename}_LIBRARY ${OpenSG_${basename}_LIBRARY} CACHE FILEPATH "The OpenSG ${basename} library") SET(OpenSG_${basename}_LIBRARY ${OpenSG_${basename}_LIBRARY} CACHE FILEPATH "The OpenSG ${basename} library")
GET_FILENAME_COMPONENT(OpenSG_LIBRARY_DIRS "${OpenSG_${basename}_LIBRARY}" PATH) GET_FILENAME_COMPONENT(OpenSG_LIBRARY_DIRS "${OpenSG_${basename}_LIBRARY}" PATH)
SET(OpenSG_LIBRARY_DIRS ${OpenSG_LIBRARY_DIRS} CACHE FILEPATH "OpenSG library directory") SET(OpenSG_LIBRARY_DIRS ${OpenSG_LIBRARY_DIRS} CACHE FILEPATH "OpenSG library directory")
SET(OpenSG_${basename}_FOUND ON CACHE INTERNAL "Whether the OpenSG ${basename} library found") SET(OpenSG_${basename}_FOUND ON CACHE INTERNAL "Whether the OpenSG ${basename} library found")
ENDIF(OpenSG_${basename}_LIBRARY) ENDIF(OpenSG_${basename}_LIBRARY)
ENDIF(OpenSG_INCLUDE_DIR) ENDIF(OpenSG_INCLUDE_DIR)
# Make variables changeble to the advanced user # Make variables changeble to the advanced user
...@@ -149,8 +152,8 @@ ELSE(__OpenSG_IN_CACHE) ...@@ -149,8 +152,8 @@ ELSE(__OpenSG_IN_CACHE)
${OPENSG_ROOT}/lib ${OPENSG_ROOT}/lib
${LIBRARIES_DIR}/opensg/lib ${LIBRARIES_DIR}/opensg/lib
${CMAKE_SOURCE_DIR}/../opensg/lib ) ${CMAKE_SOURCE_DIR}/../opensg/lib )
else (VS32) else (VS32)
if (VS64) if (VS64)
# Visual Studio x64 # Visual Studio x64
SET( __OpenSG_INCLUDE_SEARCH_DIRS SET( __OpenSG_INCLUDE_SEARCH_DIRS
$ENV{OPENSG_ROOT}/include $ENV{OPENSG_ROOT}/include
...@@ -162,17 +165,17 @@ ELSE(__OpenSG_IN_CACHE) ...@@ -162,17 +165,17 @@ ELSE(__OpenSG_IN_CACHE)
${OPENSG_ROOT}/lib ${OPENSG_ROOT}/lib
${LIBRARIES_DIR}/opensg_x64/lib ${LIBRARIES_DIR}/opensg_x64/lib
${CMAKE_SOURCE_DIR}/../opensg_x64/lib ) ${CMAKE_SOURCE_DIR}/../opensg_x64/lib )
else (VS64) else (VS64)
# Linux or Mac # Linux or Mac
SET( __OpenSG_INCLUDE_SEARCH_DIRS SET( __OpenSG_INCLUDE_SEARCH_DIRS
"/usr/local" "/usr/local"
"/usr/local/include" ) "/usr/local/include" )
SET( __OpenSG_LIBRARIES_SEARCH_DIRS SET( __OpenSG_LIBRARIES_SEARCH_DIRS
"/usr/local" "/usr/local"
"/usr/local/lib" ) "/usr/local/lib" )
endif(VS64) endif(VS64)
endif (VS32) endif (VS32)
# handle input variable OPENSG_INCLUDE_DIR # handle input variable OPENSG_INCLUDE_DIR
IF(OPENSG_INCLUDE_DIR) IF(OPENSG_INCLUDE_DIR)
...@@ -187,7 +190,7 @@ ELSE(__OpenSG_IN_CACHE) ...@@ -187,7 +190,7 @@ ELSE(__OpenSG_IN_CACHE)
SET(__OpenSG_LIBRARIES_SEARCH_DIRS SET(__OpenSG_LIBRARIES_SEARCH_DIRS
${OPENSG_LIBRARY_DIR} ${__OpenSG_LIBRARIES_SEARCH_DIRS}) ${OPENSG_LIBRARY_DIR} ${__OpenSG_LIBRARIES_SEARCH_DIRS})
ENDIF(OPENSG_LIBRARY_DIR) ENDIF(OPENSG_LIBRARY_DIR)
# handle input variable OPENSG_INCLUDE_SEARCH_DIR # handle input variable OPENSG_INCLUDE_SEARCH_DIR
IF(OPENSG_INCLUDE_SEARCH_DIR) IF(OPENSG_INCLUDE_SEARCH_DIR)
FILE(TO_CMAKE_PATH ${OPENSG_INCLUDE_SEARCH_DIR} OPENSG_INCLUDE_SEARCH_DIR) FILE(TO_CMAKE_PATH ${OPENSG_INCLUDE_SEARCH_DIR} OPENSG_INCLUDE_SEARCH_DIR)
...@@ -217,15 +220,15 @@ ELSE(__OpenSG_IN_CACHE) ...@@ -217,15 +220,15 @@ ELSE(__OpenSG_IN_CACHE)
SET(OpenSG_${UPPERCOMPONENT}_LIBRARY "OpenSG_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" ) SET(OpenSG_${UPPERCOMPONENT}_LIBRARY "OpenSG_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
SET(OpenSG_${UPPERCOMPONENT}_LIBRARY_RELEASE "OpenSG_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" ) SET(OpenSG_${UPPERCOMPONENT}_LIBRARY_RELEASE "OpenSG_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
SET(OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG "OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND") SET(OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG "OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
IF (WIN32) IF (WIN32)
FIND_LIBRARY(OpenSG_${UPPERCOMPONENT}_LIBRARY_RELEASE FIND_LIBRARY(OpenSG_${UPPERCOMPONENT}_LIBRARY_RELEASE
NAMES ${COMPONENT} NAMES ${COMPONENT}
HINTS ${__OpenSG_LIBRARIES_SEARCH_DIRS} HINTS ${__OpenSG_LIBRARIES_SEARCH_DIRS}
) )
#message(STATUS "OpenSG Component: " ${COMPONENT}) #message(STATUS "OpenSG Component: " ${COMPONENT})
FIND_LIBRARY(OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG FIND_LIBRARY(OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG
# 1.8 Added the "D" suffix # 1.8 Added the "D" suffix
NAMES ${COMPONENT}D NAMES ${COMPONENT}D
...@@ -239,16 +242,16 @@ ELSE(__OpenSG_IN_CACHE) ...@@ -239,16 +242,16 @@ ELSE(__OpenSG_IN_CACHE)
HINTS ${__OpenSG_LIBRARIES_SEARCH_DIRS} HINTS ${__OpenSG_LIBRARIES_SEARCH_DIRS}
PATH_SUFFIXES "/opt" PATH_SUFFIXES "/opt"
) )
#message(STATUS "OpenSG Component: " ${COMPONENT}) #message(STATUS "OpenSG Component: " ${COMPONENT})
FIND_LIBRARY(OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG FIND_LIBRARY(OpenSG_${UPPERCOMPONENT}_LIBRARY_DEBUG
NAMES ${COMPONENT} NAMES ${COMPONENT}
HINTS ${__OpenSG_LIBRARIES_SEARCH_DIRS} HINTS ${__OpenSG_LIBRARIES_SEARCH_DIRS}
PATH_SUFFIXES "/dbg" PATH_SUFFIXES "/dbg"
) )
ENDIF(WIN32) ENDIF(WIN32)
__OpenSG_ADJUST_LIB_VARS(${UPPERCOMPONENT}) __OpenSG_ADJUST_LIB_VARS(${UPPERCOMPONENT})
ENDFOREACH(COMPONENT) ENDFOREACH(COMPONENT)
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
...@@ -286,7 +289,7 @@ ELSE(__OpenSG_IN_CACHE) ...@@ -286,7 +289,7 @@ ELSE(__OpenSG_IN_CACHE)
SET(OpenSG_ERROR_REASON SET(OpenSG_ERROR_REASON
"${OpenSG_ERROR_REASON} ${COMPONENT}\n") "${OpenSG_ERROR_REASON} ${COMPONENT}\n")
ENDFOREACH(COMPONENT) ENDFOREACH(COMPONENT)
LIST(LENGTH OpenSG_FIND_COMPONENTS __OpenSG_NUM_COMPONENTS_WANTED) LIST(LENGTH OpenSG_FIND_COMPONENTS __OpenSG_NUM_COMPONENTS_WANTED)
LIST(LENGTH __OpenSG_MISSING_COMPONENTS __OpenSG_NUM_MISSING_COMPONENTS) LIST(LENGTH __OpenSG_MISSING_COMPONENTS __OpenSG_NUM_MISSING_COMPONENTS)
IF(${__OpenSG_NUM_COMPONENTS_WANTED} EQUAL ${__OpenSG_NUM_MISSING_COMPONENTS}) IF(${__OpenSG_NUM_COMPONENTS_WANTED} EQUAL ${__OpenSG_NUM_MISSING_COMPONENTS})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment