Fixes (#48)

* fix: ray mask check

* feat: allow to exclude dependencies

* fix: formatting

* refactor: make system embree global

* Revert "feat: allow to exclude dependencies"

This reverts commit 6a39d29.

* refactor: differentiate tbb and embree

* fix: missing include

* fix(cmake): add openmp to install dependencies

CMakeLists.txt

@@ -49,13 +49,17 @@ endif()
 
 include("cmake/openmp.cmake")
 include("cmake/embree.cmake")
+include("cmake/tbb.cmake")
 
 find_package(embree ${VIENNARAY_EMBREE_VERSION} QUIET)
-set(VIENNARAY_SYSTEM_EMBREE ${embree_FOUND})
+set(VIENNARAY_SYSTEM_EMBREE
+    ${embree_FOUND}
+    CACHE INTERNAL "")
 
-if(NOT VIENNARAY_SYSTEM_EMBREE)
-  message(STATUS "[ViennaRay] Using remote embree")
-endif()
+find_package(TBB QUIET)
+set(VIENNARAY_SYSTEM_TBB
+    ${TBB_FOUND}
+    CACHE INTERNAL "")
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Library
@@ -154,4 +158,4 @@ packageProject(
   INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include/viennaray
   INCLUDE_DESTINATION include/viennaray-${PROJECT_VERSION}
   COMPATIBILITY SameMajorVersion
-  DEPENDENCIES "embree;TBB")
+  DEPENDENCIES "embree;TBB;OpenMP")

cmake/embree.cmake

@@ -1,15 +1,8 @@
 macro(setup_embree_env TARGET OUTPUT)
-    message(STATUS "[ViennaRay] Setting up Embree-Environment for ${TARGET}")
+  message(STATUS "[ViennaRay] Setting up Embree-Environment for ${TARGET}")
 
-    add_custom_command(
-      TARGET ${TARGET}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory $<TARGET_FILE_DIR:tbb>
-              ${OUTPUT})
-
-    add_custom_command(
-      TARGET ${TARGET}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory $<TARGET_FILE_DIR:embree>
-              ${OUTPUT})
+  add_custom_command(
+    TARGET ${TARGET}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory $<TARGET_FILE_DIR:embree> ${OUTPUT})
 endmacro()

cmake/tbb.cmake

@@ -0,0 +1,8 @@
+macro(setup_tbb_env TARGET OUTPUT)
+  message(STATUS "[ViennaRay] Setting up TBB-Environment for ${TARGET}")
+
+  add_custom_command(
+    TARGET ${TARGET}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory $<TARGET_FILE_DIR:tbb> ${OUTPUT})
+endmacro()

examples/CMakeLists.txt

@@ -1,8 +1,15 @@
 add_custom_target(ViennaRay_Examples ALL)
 
-if (WIN32 AND NOT VIENNARAY_DISABLE_COPY AND NOT VIENNARAY_SYSTEM_EMBREE)
+if(WIN32 AND NOT VIENNARAY_DISABLE_COPY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/examples>)
-  setup_embree_env(ViennaRay_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+
+  if(NOT VIENNARAY_SYSTEM_EMBREE)
+    setup_embree_env(ViennaRay_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  endif()
+
+  if(NOT VIENNARAY_SYSTEM_TBB)
+    setup_tbb_env(ViennaRay_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  endif()
 endif()
 
 file(

tests/CMakeLists.txt

@@ -1,8 +1,15 @@
 add_custom_target(ViennaRay_Tests ALL)
 
-if (WIN32 AND NOT VIENNARAY_DISABLE_COPY AND NOT VIENNARAY_SYSTEM_EMBREE)
+if(WIN32 AND NOT VIENNARAY_DISABLE_COPY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/tests>)
-  setup_embree_env(ViennaRay_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+
+  if(NOT VIENNARAY_SYSTEM_EMBREE)
+    setup_embree_env(ViennaRay_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  endif()
+
+  if(NOT VIENNARAY_SYSTEM_TBB)
+    setup_tbb_env(ViennaRay_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  endif()
 endif()
 
 file(