Skip to content

Commit

Permalink
Merge pull request #533 from JonasLukasczyk/cinemaImagingBackend
Browse files Browse the repository at this point in the history
Cinema Imaging Backend
  • Loading branch information
julien-tierny authored Nov 20, 2020
2 parents d80b61f + 24cbd61 commit 83741e7
Show file tree
Hide file tree
Showing 30 changed files with 2,598 additions and 716 deletions.
6 changes: 6 additions & 0 deletions CMake/BaseCode.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ function(ttk_set_compile_options library)
target_link_libraries(${library} PUBLIC ${GRAPHVIZ_PATHPLAN_LIBRARY})
endif()

if (TTK_ENABLE_EMBREE AND EMBREE_FOUND)
target_compile_definitions(${library} PUBLIC TTK_ENABLE_EMBREE)
target_include_directories(${library} PUBLIC ${EMBREE_INCLUDE_DIR})
target_link_libraries(${library} PUBLIC ${EMBREE_LIBRARY})
endif()

# TODO per module
if (TTK_ENABLE_SQLITE3)
target_compile_definitions(${library} PUBLIC TTK_ENABLE_SQLITE3)
Expand Down
1 change: 1 addition & 0 deletions CMake/Print.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ function(ttk_print_summary)
message(STATUS "TTK_ENABLE_CPU_OPTIMIZATION: ${TTK_ENABLE_CPU_OPTIMIZATION}")
message(STATUS "TTK_ENABLE_DOUBLE_TEMPLATING: ${TTK_ENABLE_DOUBLE_TEMPLATING}")
message(STATUS "TTK_ENABLE_EIGEN: ${TTK_ENABLE_EIGEN}")
message(STATUS "TTK_ENABLE_EMBREE: ${TTK_ENABLE_EMBREE}")
message(STATUS "TTK_ENABLE_GRAPHVIZ: ${TTK_ENABLE_GRAPHVIZ}")
message(STATUS "TTK_ENABLE_KAMIKAZE: ${TTK_ENABLE_KAMIKAZE}")
message(STATUS "TTK_ENABLE_MPI: ${TTK_ENABLE_MPI}")
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- task: Cache@2
inputs:
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20"
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20c"
path: $(Build.ArtifactStagingDirectory)/vtk-install
cacheHitVar: CACHE_RESTORED
displayName: Cache VTK build
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
- task: Cache@2
inputs:
key: ParaView | $(Agent.OS) | "$(PV_VERSION)" | "v-11-16-20"
key: ParaView | $(Agent.OS) | "$(PV_VERSION)" | "v-11-16-20c"
path: $(Build.ArtifactStagingDirectory)/pv-install
cacheHitVar: CACHE_RESTORED
displayName: Cache ParaView build
Expand Down Expand Up @@ -504,7 +504,7 @@ jobs:
steps:
- task: Cache@2
inputs:
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20"
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20c"
path: $(Build.ArtifactStagingDirectory)/vtk-install
cacheHitVar: CACHE_RESTORED
displayName: Cache VTK build
Expand Down
8 changes: 8 additions & 0 deletions config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ else()
option(TTK_ENABLE_ZLIB "Enable Zlib support" ON)
endif()

find_package(EMBREE 3.6)
if(EMBREE_FOUND)
option(TTK_ENABLE_EMBREE "Enable embree raytracing for ttkCinemaImaging" ON)
else()
option(TTK_ENABLE_EMBREE "Enable embree raytracing for ttkCinemaImaging" OFF)
message(STATUS "EMBREE library not found, disabling embree support in TTK.")
endif()

# START_FIND_GRAPHVIZ
find_path(GRAPHVIZ_INCLUDE_DIR
NAMES
Expand Down
Loading

0 comments on commit 83741e7

Please sign in to comment.