Skip to content

Commit 1562468

Browse files
authored
Update ispc binary path on Windows, update civetweb to v1.16 (#6577)
1 parent 172367e commit 1562468

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

3rdparty/civetweb/civetweb.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ include(ExternalProject)
33
ExternalProject_Add(
44
ext_civetweb
55
PREFIX civetweb
6-
URL https://github.com/civetweb/civetweb/archive/refs/tags/v1.15.tar.gz
7-
URL_HASH SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9
6+
URL https://github.com/civetweb/civetweb/archive/refs/tags/v1.16.tar.gz
7+
URL_HASH SHA256=f0e471c1bf4e7804a6cfb41ea9d13e7d623b2bcc7bc1e2a4dd54951a24d60285
88
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/civetweb"
99
UPDATE_COMMAND ""
1010
CMAKE_ARGS

cmake/Open3DFetchISPCCompiler.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ function(open3d_fetch_ispc_compiler)
5050
)
5151

5252
FetchContent_MakeAvailable(ext_ispc)
53+
if (WIN32)
54+
set(CMAKE_ISPC_COMPILER "${ext_ispc_SOURCE_DIR}/bin/ispc.exe" PARENT_SCOPE)
55+
else() # Linux
56+
set(CMAKE_ISPC_COMPILER "${ext_ispc_SOURCE_DIR}/bin/ispc" PARENT_SCOPE)
57+
endif()
5358

54-
set(CMAKE_ISPC_COMPILER "${ext_ispc_SOURCE_DIR}/bin/ispc" PARENT_SCOPE)
5559
endif()
5660
endfunction()

0 commit comments

Comments
 (0)