diff --git a/src/external/embree.cmake b/src/external/embree.cmake index 84ec42a6e..d2c4d54fb 100644 --- a/src/external/embree.cmake +++ b/src/external/embree.cmake @@ -5,8 +5,12 @@ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_EMBREE "Allow download and use of embree so option(MESHLAB_ALLOW_DOWNLOAD_DLL_EMBREE "Allow download and use of embree dll (windows only)" ON) option(MESHLAB_ALLOW_SYSTEM_EMBREE "Allow use of system-provided embree" ON) +set(EMBREE_MAJOR 4) +set(EMBREE_MINOR 3.0) +set(EMBREE_VER "${EMBREE_MAJOR}.${EMBREE_MINOR}") + # looking for embree for the filter_embree -find_package(embree 3.0) +find_package(embree ${EMBREE_MAJOR}) find_package(TBB) if(MESHLAB_ALLOW_SYSTEM_EMBREE AND TARGET embree AND TBB_FOUND) @@ -14,8 +18,8 @@ if(MESHLAB_ALLOW_SYSTEM_EMBREE AND TARGET embree AND TBB_FOUND) add_library(external-embree INTERFACE) target_link_libraries(external-embree INTERFACE embree tbb) elseif(MESHLAB_ALLOW_DOWNLOAD_DLL_EMBREE AND WIN32) - set(EMBREE_WIN_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/embree-3.13.5.x64.vc14.windows") - set(EMBREE_WIN_CHECK "${EMBREE_WIN_DIR}/lib/embree3.lib") + set(EMBREE_WIN_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/embree-${EMBREE_VER}.x64.windows") + set(EMBREE_WIN_CHECK "${EMBREE_WIN_DIR}/lib/embree${EMBREE_MAJOR}.lib") set(TBB_WIN_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/oneapi-tbb-2021.6.0") set(TBB_WIN_CHECK "${TBB_WIN_DIR}/lib/cmake/tbb/TBBConfig.cmake") @@ -33,7 +37,7 @@ elseif(MESHLAB_ALLOW_DOWNLOAD_DLL_EMBREE AND WIN32) endif() if(NOT EXISTS ${EMBREE_WIN_CHECK}) - set(EMBREE_WIN_LINK https://github.com/embree/embree/releases/download/v3.13.5/embree-3.13.5.x64.vc14.windows.zip) + set(EMBREE_WIN_LINK https://github.com/embree/embree/releases/download/v${EMBREE_VER}/embree-${EMBREE_VER}.x64.windows.zip) #set(EMBREE_WIN_MD5 ) download_and_unzip( NAME "embree dll" @@ -49,7 +53,7 @@ elseif(MESHLAB_ALLOW_DOWNLOAD_DLL_EMBREE AND WIN32) message(STATUS "- embree - using downloaded dll") set(TBB_DIR "${TBB_WIN_DIR}/lib/cmake/tbb") - set(embree_DIR "${EMBREE_WIN_DIR}/lib/cmake/embree-3.13.5") + set(embree_DIR "${EMBREE_WIN_DIR}/lib/cmake/embree-${EMBREE_VER}") find_package(embree) add_library(external-embree INTERFACE) @@ -58,7 +62,7 @@ elseif(MESHLAB_ALLOW_DOWNLOAD_DLL_EMBREE AND WIN32) if (DEFINED MESHLAB_LIB_OUTPUT_DIR) file( COPY - ${EMBREE_WIN_DIR}/bin/embree3.dll + ${EMBREE_WIN_DIR}/bin/embree${EMBREE_MAJOR}.dll ${EMBREE_WIN_DIR}/bin/tbb12.dll DESTINATION ${MESHLAB_LIB_OUTPUT_DIR}) @@ -66,14 +70,14 @@ elseif(MESHLAB_ALLOW_DOWNLOAD_DLL_EMBREE AND WIN32) if (DEFINED MESHLAB_LIB_INSTALL_DIR) install( FILES - ${EMBREE_WIN_DIR}/bin/embree3.dll + ${EMBREE_WIN_DIR}/bin/embree${EMBREE_MAJOR}.dll ${EMBREE_WIN_DIR}/bin/tbb12.dll DESTINATION ${MESHLAB_LIB_INSTALL_DIR}) endif() endif() elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_EMBREE AND (UNIX AND NOT APPLE) AND TBB_FOUND) - set(EMBREE_SRC_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/embree-3.13.5") + set(EMBREE_SRC_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/embree-${EMBREE_VER}") set(EMBREE_CHECK "${EMBREE_SRC_DIR}/CMakeLists.txt") set(ISPC_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/ispc-v1.18.1-linux") set(ISPC_CHECK "${ISPC_DIR}/bin/ispc") @@ -94,7 +98,7 @@ elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_EMBREE AND (UNIX AND NOT APPLE) AND TBB_FOU if (NOT EXISTS ${EMBREE_CHECK}) set(EMBREE_LINK - https://github.com/embree/embree/archive/refs/tags/v3.13.5.zip) + https://github.com/embree/embree/archive/refs/tags/v${EMBREE_VER}.zip) #set(EMBREE_MD5 ) download_and_unzip( NAME "embree" diff --git a/src/vcglib b/src/vcglib index 6298169bc..9b8a069e0 160000 --- a/src/vcglib +++ b/src/vcglib @@ -1 +1 @@ -Subproject commit 6298169bce604da453d2927a69d4ef9d9b05fac5 +Subproject commit 9b8a069e0cd7318447b44fea495965c9a51c1bdb