Selaa lähdekoodia

removed embree (build is broken in this commit)

Former-commit-id: 575f4d7b37df6afa587de1b1f4f80a028601c7ac
Daniele Panozzo 9 vuotta sitten
vanhempi
commit
0372c729d5

+ 1 - 5
tutorial/606_AmbientOcclusion/CMakeLists.txt

@@ -3,13 +3,9 @@ project(606_AmbientOcclusion)
 
 include("../CMakeLists.shared")
 
-find_package(EMBREE REQUIRED)
-
-include_directories(${EMBREE_INCLUDE_DIRS})
-
 set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )
 
 add_executable(${PROJECT_NAME}_bin ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(${PROJECT_NAME}_bin ${SHARED_LIBRARIES} ${EMBREE_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin ${SHARED_LIBRARIES})

+ 1 - 5
tutorial/607_Picking/CMakeLists.txt

@@ -3,13 +3,9 @@ project(607_Picking)
 
 include("../CMakeLists.shared")
 
-find_package(EMBREE REQUIRED)
-
-include_directories(${EMBREE_INCLUDE_DIRS})
-
 set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )
 
 add_executable(${PROJECT_NAME}_bin ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(${PROJECT_NAME}_bin ${SHARED_LIBRARIES} ${EMBREE_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin ${SHARED_LIBRARIES})

+ 16 - 4
tutorial/CMakeLists.txt

@@ -47,6 +47,18 @@ include_directories("../external/nanogui/include")
 include_directories("../external/nanogui/ext/nanovg/src")
 list(APPEND SHARED_LIBRARIES "nanogui" "glfw")
 
+#Compile embree
+option(ENABLE_ISPC_SUPPORT OFF)
+option(RTCORE_TASKING_SYSTEM INTERNAL)
+option(ENABLE_STATIC_LIB ON)
+option(ENABLE_TUTORIALS OFF)
+option(XEON_ISA SSE2)
+
+add_subdirectory("../external/embree/" "embree")
+include_directories("../external/embree/include")
+list(APPEND SHARED_LIBRARIES "embree")
+
+
 message(STATUS "Linking with: ${LIBIGL_LIBRARIES}")
 list(APPEND SHARED_LIBRARIES ${LIBIGL_LIBRARIES})
 
@@ -112,10 +124,10 @@ if(MATLAB_FOUND)
 endif(MATLAB_FOUND)
 add_subdirectory("604_Triangle")
 add_subdirectory("605_Tetgen")
-if(EMBREE_FOUND)
-  add_subdirectory("606_AmbientOcclusion")
-  add_subdirectory("607_Picking")
-endif(EMBREE_FOUND)
+
+add_subdirectory("606_AmbientOcclusion")
+add_subdirectory("607_Picking")
+
 if(LIM_FOUND)
   add_subdirectory("608_LIM")
 endif(LIM_FOUND)