Skip to content

Commit 732e650

Browse files
committed
apply some correction, update gitmodules
1 parent 19aaeed commit 732e650

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@
8686
[submodule "3rdparty/nbl_spirv_cross"]
8787
path = 3rdparty/nbl_spirv_cross
8888
url = https://github.com/devshgraphicsprogramming/SPIRV-Cross.git
89-
[submodule "3rdparty/pstl/oneDPL/oneDPL"]
90-
path = 3rdparty/pstl/oneDPL/oneDPL
91-
url = https://github.com/oneapi-src/oneDPL.git
9289
[submodule "3rdparty/pstl/oneTBB"]
9390
path = 3rdparty/pstl/oneTBB
9491
url = https://github.com/Devsh-Graphics-Programming/oneTBB.git

src/nbl/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,9 @@ nbl_target_link_spirv_tools(Nabla)
551551
nbl_target_link_volk(Nabla)
552552
nbl_target_link_EGL(Nabla)
553553
nbl_target_link_simdjson(Nabla)
554-
nbl_target_link_oneDPL(Nabla)
554+
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
555+
nbl_target_link_oneDPL(Nabla)
556+
endif()
555557

556558
#target_link_libraries(Nabla INTERFACE ${OPENGL_gl_LIBRARY})
557559
if (UNIX)
@@ -706,7 +708,9 @@ nbl_install_lib(OSDependent)
706708
nbl_install_lib(zlibstatic)
707709
nbl_install_lib(simdjson)
708710
nbl_install_lib(volk)
709-
nbl_install_lib(tbb)
710-
nbl_install_lib(tbbmalloc)
711-
nbl_install_lib(tbbmalloc_proxy)
711+
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
712+
nbl_install_lib(tbb)
713+
nbl_install_lib(tbbmalloc)
714+
nbl_install_lib(tbbmalloc_proxy)
715+
endif()
712716

0 commit comments

Comments
 (0)