From 15624686c4fffdde9ad7b6b102a498f593436906 Mon Sep 17 00:00:00 2001 From: Ahmed Elsayed Date: Tue, 16 Apr 2024 18:52:48 +0200 Subject: [PATCH] Update ispc binary path on Windows, update civetweb to v1.16 (#6577) --- 3rdparty/civetweb/civetweb.cmake | 4 ++-- cmake/Open3DFetchISPCCompiler.cmake | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/3rdparty/civetweb/civetweb.cmake b/3rdparty/civetweb/civetweb.cmake index dc8d556ea64..5d4749fe4e7 100644 --- a/3rdparty/civetweb/civetweb.cmake +++ b/3rdparty/civetweb/civetweb.cmake @@ -3,8 +3,8 @@ include(ExternalProject) ExternalProject_Add( ext_civetweb PREFIX civetweb - URL https://github.com/civetweb/civetweb/archive/refs/tags/v1.15.tar.gz - URL_HASH SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9 + URL https://github.com/civetweb/civetweb/archive/refs/tags/v1.16.tar.gz + URL_HASH SHA256=f0e471c1bf4e7804a6cfb41ea9d13e7d623b2bcc7bc1e2a4dd54951a24d60285 DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/civetweb" UPDATE_COMMAND "" CMAKE_ARGS diff --git a/cmake/Open3DFetchISPCCompiler.cmake b/cmake/Open3DFetchISPCCompiler.cmake index 3f7940c648b..1753b52325e 100644 --- a/cmake/Open3DFetchISPCCompiler.cmake +++ b/cmake/Open3DFetchISPCCompiler.cmake @@ -50,7 +50,11 @@ function(open3d_fetch_ispc_compiler) ) FetchContent_MakeAvailable(ext_ispc) + if (WIN32) + set(CMAKE_ISPC_COMPILER "${ext_ispc_SOURCE_DIR}/bin/ispc.exe" PARENT_SCOPE) + else() # Linux + set(CMAKE_ISPC_COMPILER "${ext_ispc_SOURCE_DIR}/bin/ispc" PARENT_SCOPE) + endif() - set(CMAKE_ISPC_COMPILER "${ext_ispc_SOURCE_DIR}/bin/ispc" PARENT_SCOPE) endif() endfunction()