mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 03:00:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small bugfix for OS X

Browse Source
This commit is contained in:
Jonas Strandstedt
2014-02-18 18:33:20 -05:00
parent 1d15e8b2a6
commit d43b4a8ca5
5 changed files with 128 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@@ -53,24 +53,10 @@ set(DEPENDENT_LIBS ${DEPENDENT_LIBS} Ghoul)
# Add ghoul ext
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${GHOUL_ROOT_DIR}/ext)
# SGCT (TODO: write cmake script)
#set(SGCT_ROOT_DIR "$ENV{SGCT_ROOT_DIR}")
#set(SGCT_ROOT_DIR "C:/Program Files/SGCT/SGCT_2.0.7")
#set(SGCT_ROOT_DIR "C:/Program Files (x86)/SGCT/SGCT_2.0.5_x86")
set(SGCT_ROOT_DIR "C:/Program Files/SGCT/SGCT_2.0.7")
add_definitions(-D__WIN32__)
add_definitions(-DGLEW_STATIC)
include_directories("${SGCT_ROOT_DIR}/include")
#set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${SGCT_ROOT_DOR}/bin/lib/msvc11)
set(DEPENDENT_LIBS
${DEPENDENT_LIBS}
"Ws2_32.lib"
optimized "${SGCT_ROOT_DIR}/lib/msvc11_x64/sgct.lib"
debug "${SGCT_ROOT_DIR}/lib/msvc11_x64/sgctd.lib"
)
#add_subdirectory(${SGCT_ROOT_DIR})
#set(DEPENDENT_LIBS ${DEPENDENT_LIBS} SGCT)
# SGCT
find_package(SGCT REQUIRED)
include_directories(${SGCT_INCLUDE_DIRECTORIES})
set(DEPENDENT_LIBS ${DEPENDENT_LIBS} ${SGCT_LIBRARIES})
# GLM
set(GLM_ROOT_DIR "${GHOUL_ROOT_DIR}/ext/glm")
@@ -83,9 +69,9 @@ include_directories(${GLM_INCLUDE_DIRS})
#set(DEPENDENT_LIBS ${DEPENDENT_LIBS} ${OPENGL_LIBRARIES})
# GLEW
#find_package(GLEW REQUIRED)
#include_directories(${GLEW_INCLUDE_DIRECTORIES})
#set(DEPENDENT_LIBS ${DEPENDENT_LIBS} ${GLEW_LIBRARIES})
find_package(GLEW REQUIRED)
include_directories(${GLEW_INCLUDE_DIRECTORIES})
set(DEPENDENT_LIBS ${DEPENDENT_LIBS} ${GLEW_LIBRARIES})
# Lua
set(LUA_ROOT_DIR "${GHOUL_ROOT_DIR}/ext/lua")
@@ -102,10 +88,10 @@ set(DEPENDENT_LIBS ${DEPENDENT_LIBS} Spice)
if (APPLE)
include_directories(/Developer/Headers/FlatCarbon)
find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa)
find_library(APP_SERVICES_LIBRARY ApplicationServices)
mark_as_advanced(CARBON_LIBRARY COCOA_LIBRARY APP_SERVICES_LIBRARY)
set(DEPENDENT_LIBS ${CARBON_LIBRARY} ${COCOA_LIBRARY} ${APP_SERVICES_LIBRARY})
set(DEPENDENT_LIBS ${DEPENDENT_LIBS} ${CARBON_LIBRARY} ${COCOA_LIBRARY} ${APP_SERVICES_LIBRARY})
endif ()
#########################################################################################

94
ext/FindSGCT.cmake Normal file
View File

@@ -0,0 +1,94 @@
# Find the library
if(WIN32)
add_definitions(-D__WIN32__)
file(GLOB SGCT_WINDOWS_PATHS "C:/Program Files/SGCT/SGCT_*")
find_path(SGCT_ROOT_DIR include/sgct.h HINTS
"${SGCT_WINDOWS_PATHS}"
)
set(DEPENDENT_LIBS
${DEPENDENT_LIBS}
"Ws2_32.lib"
optimized "${SGCT_ROOT_DIR}/lib/msvc11_x64/sgct.lib"
debug "${SGCT_ROOT_DIR}/lib/msvc11_x64/sgctd.lib"
)
else()
find_path(SGCT_ROOT_DIR include/sgct.h HINTS
"/opt/local/include/sgct"
"/usr/local/include/sgct"
"/usr/include/sgct"
"/opt/local"
"/usr/local"
)
find_library(SGCT_LIBRARY NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}sgct_cpp11${CMAKE_STATIC_LIBRARY_SUFFIX}
HINTS "${SGCT_ROOT_DIR}/lib")
endif()
# make sure glew is static
add_definitions(-DGLEW_STATIC)
if (APPLE)
find_library(FRAMEWORK_IOKit
NAMES IOKit
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
PATH_SUFFIXES Frameworks
NO_DEFAULT_PATH
)
find_library(FRAMEWORK_CoreVideo
NAMES CoreVideo
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
PATH_SUFFIXES Frameworks
NO_DEFAULT_PATH
)
find_library(FRAMEWORK_Cocoa
NAMES Cocoa
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
PATH_SUFFIXES Frameworks
NO_DEFAULT_PATH
)
set(SGCT_DEPENDENCIES ${SGCT_DEPENDENCIES} ${FRAMEWORK_IOKit} ${FRAMEWORK_CoreVideo} ${FRAMEWORK_Cocoa})
endif (APPLE)
# includes
set(SGCT_INCLUDES "${SGCT_ROOT_DIR}/include")
include_directories(${SGCT_INCLUDE_DIRS})
# libraries
set(SGCT_INCLUDE_DIRECTORIES ${SGCT_INCLUDES})
set(SGCT_LIBRARIES ${SGCT_DEPENDENCIES} ${SGCT_LIBRARY})
#set(SGCT_LIBRARIES "${SGCT_LIBRARY}")
# handle the QUIETLY and REQUIRED arguments and set SGCT_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(SGCT DEFAULT_MSG
SGCT_LIBRARY SGCT_INCLUDES)
mark_as_advanced(SGCT_INCLUDE_DIR SGCT_LIBRARY )
if(SGCT_FOUND)
MESSAGE(STATUS "SGCT found: ${SGCT_INCLUDES}/sgct.h")
MESSAGE(STATUS "SGCT SGCT_LIBRARY: ${SGCT_LIBRARY}")
else()
MESSAGE(FATAL_ERROR "SGCT not found!")
endif(SGCT_FOUND)
# OLD STUFF. REMOVE WHEN ABOVE WORKS
#set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${SGCT_ROOT_DOR}/bin/lib/msvc11)
#set(DEPENDENT_LIBS
# ${DEPENDENT_LIBS}
# "Ws2_32.lib"
# optimized "${SGCT_ROOT_DIR}/lib/msvc11_x64/sgct.lib"
# debug "${SGCT_ROOT_DIR}/lib/msvc11_x64/sgctd.lib"
# )
#add_subdirectory(${SGCT_ROOT_DIR})
#set(DEPENDENT_LIBS ${DEPENDENT_LIBS} SGCT)

2
ext/ghoul

Submodule ext/ghoul updated: 270056597a...0e4ef0b930

2
ext/spice

Submodule ext/spice updated: 784478de97...1ea38307b2

23
src/CMakeLists.txt
View File

@@ -88,5 +88,28 @@ include_directories(${HEADER_ROOT_DIR})
# hack:
set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${OPENSPACE_EXT_DIR}/tinythread.cpp)
if (APPLE)
find_library(FRAMEWORK_IOKit
NAMES IOKit
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
PATH_SUFFIXES Frameworks
NO_DEFAULT_PATH
)
find_library(FRAMEWORK_CoreVideo
NAMES CoreVideo
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
PATH_SUFFIXES Frameworks
NO_DEFAULT_PATH
)
find_library(FRAMEWORK_Cocoa
NAMES Cocoa
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
PATH_SUFFIXES Frameworks
NO_DEFAULT_PATH
)
set(SGCT_DEPENDENCIES ${SGCT_DEPENDENCIES} ${FRAMEWORK_IOKit} ${FRAMEWORK_CoreVideo} ${FRAMEWORK_Cocoa})
endif (APPLE)
#add_definitions(-framework IOKit -framework CoreVideo)
add_executable(OpenSpace ${OPENSPACE_HEADER} ${OPENSPACE_SOURCE})
target_link_libraries(OpenSpace ${DEPENDENT_LIBS})