mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 17:51:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into properties

Browse Source
This commit is contained in:
Alexander Bock
2014-03-08 00:40:14 +01:00
parent b5b2e4eab7 79753b17bd
commit 1019be8300
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -87,6 +87,14 @@ include_directories("${SPICE_ROOT_DIR}/include")
add_subdirectory(${SPICE_ROOT_DIR})
set(DEPENDENT_LIBS ${DEPENDENT_LIBS} Spice)
# OpenCL
find_package(OpenCL)
if(OPENCL_FOUND)
add_definitions(-DGHL_OPENCL)
include_directories(${OPENCL_INCLUDE_DIRS})
set(GHOUL_DEPENDENCIES ${GHOUL_DEPENDENCIES} ${OPENCL_LIBRARIES})
endif(OPENCL_FOUND)
if (APPLE)
include_directories(/Developer/Headers/FlatCarbon)
find_library(CARBON_LIBRARY Carbon)

2
ext/ghoul

Submodule ext/ghoul updated: 670a10c252...f6a96f6767

11
src/openspaceengine.cpp
View File

@@ -135,12 +135,11 @@ bool OpenSpaceEngine::initialize() {
// Detect and logOpenCL and OpenGL versions and available devices
ghoul::systemcapabilities::SystemCapabilities::initialize();
ghoul::systemcapabilities::SystemCapabilities::ref().addComponent(
new ghoul::systemcapabilities::OpenCLCapabilitiesComponent);
ghoul::systemcapabilities::SystemCapabilities::ref().addComponent(
new ghoul::systemcapabilities::OpenGLCapabilitiesComponent);
ghoul::systemcapabilities::SystemCapabilities::ref().detectCapabilities();
ghoul::systemcapabilities::SystemCapabilities::ref().logCapabilities();
SysCap.addComponent(new ghoul::systemcapabilities::CPUCapabilitiesComponent);
SysCap.addComponent(new ghoul::systemcapabilities::OpenCLCapabilitiesComponent);
SysCap.addComponent(new ghoul::systemcapabilities::OpenGLCapabilitiesComponent);
SysCap.detectCapabilities();
SysCap.logCapabilities();
// initialize OpenSpace helpers
Time::init();