chore(deps): bump viennacore

ViennaTools · Jul 16, 2024 · a78d181 · a78d181
1 parent 4fdd33f
commit a78d181
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,13 +43,6 @@ if(VIENNARAY_EMBREE_VERSION GREATER_EQUAL 4)
   set(EMBREE_RAY_MASK ON)
 endif()
 
-# --------------------------------------------------------------------------------------------------------
-# Configuration
-# --------------------------------------------------------------------------------------------------------
-
-include("cmake/embree.cmake")
-include("cmake/tbb.cmake")
-
 # --------------------------------------------------------------------------------------------------------
 # Setup Library
 # --------------------------------------------------------------------------------------------------------
@@ -98,7 +91,7 @@ include("cmake/cpm.cmake")
 
 CPMAddPackage(
   NAME ViennaCore
-  GIT_TAG v1.0.0
+  VERSION 1.1.0
   GIT_REPOSITORY "https://github.com/ViennaTools/ViennaCore"
   OPTIONS "VIENNACORE_FORMAT_EXCLUDE docs/")
 

diff --git a/cmake/embree.cmake b/cmake/embree.cmake
diff --git a/cmake/tbb.cmake b/cmake/tbb.cmake
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -2,8 +2,8 @@ add_custom_target(ViennaRay_Examples ALL)
 
 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})
-  setup_tbb_env(ViennaRay_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  viennacore_setup_embree_env(ViennaRay_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  viennacore_setup_tbb_env(ViennaRay_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
 viennacore_add_subdirs(${CMAKE_CURRENT_LIST_DIR})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,8 +2,8 @@ add_custom_target(ViennaRay_Tests ALL)
 
 if(WIN32)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/tests>)
-  setup_embree_env(ViennaRay_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-  setup_tbb_env(ViennaRay_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  viennacore_setup_embree_env(ViennaRay_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  viennacore_setup_tbb_env(ViennaRay_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
 viennacore_add_subdirs(${CMAKE_CURRENT_LIST_DIR})