Skip to content

Commit 75a7dfd

Browse files
author
jgtong
authored
Merge pull request #87 from rafbiels/voxelizer-openmp
[voxelizer][CUDA][SYCL] Add OpenMP dependency in CMakeLists
2 parents e33e4e8 + 6be04ad commit 75a7dfd

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

voxelizer/CUDA/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ message(STATUS " libraries: ${GLM_LIBRARIES}")
4343
message(STATUS " include path: ${GLM_INCLUDE_DIRS}")
4444

4545
find_package(CUDA REQUIRED)
46+
find_package(OpenMP REQUIRED)
4647

4748
if(NOT CUDA_FOUND)
4849
message(STATUS "CUDA not found. Project will not be built.")
@@ -119,4 +120,4 @@ CUDA_ADD_EXECUTABLE(
119120

120121
TARGET_COMPILE_FEATURES(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE cxx_std_17)
121122
TARGET_INCLUDE_DIRECTORIES(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_INCLUDE_DIR} ${GLM_INCLUDE_DIRS}) # TARGET_LINK_LIBRARIES(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_LIBRARY} PRIVATE CUDA::cudart PRIVATE glm::glm)
122-
TARGET_LINK_LIBRARIES(${CUDA_VOXELIZER_EXECUTABLE} ${Trimesh2_LIBRARY} ${CUDA_cudadevrt_LIBRARY} glm::glm)
123+
TARGET_LINK_LIBRARIES(${CUDA_VOXELIZER_EXECUTABLE} ${Trimesh2_LIBRARY} ${CUDA_cudadevrt_LIBRARY} glm::glm OpenMP::OpenMP_CXX)

voxelizer/SYCL/CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,8 @@ message(STATUS " version: ${glm_VERSION}")
4646
message(STATUS " libraries: ${GLM_LIBRARIES}")
4747
message(STATUS " include path: ${GLM_INCLUDE_DIRS}")
4848

49-
# FIND_PACKAGE(OpenMP REQUIRED)
50-
# if (OPENMP_FOUND)
51-
# message("openmp found")
52-
# else()
53-
# message("openmp not found")
54-
# endif()
55-
56-
# message(STATUS "OpenMP library status:")
57-
# message(STATUS " version: ${OpenMP_VERSION}")
58-
# message(STATUS " libraries: ${OpenMP_LIBS}")
59-
# message(STATUS " include path: ${OpenMP_INCLUDE_DIRS}")
49+
find_package(OpenMP REQUIRED)
50+
6051
SET(VOXELIZER_EXECUTABLE voxelizer_sycl)
6152

6253
IF(NOT Trimesh2_INCLUDE_DIR)
@@ -172,4 +163,4 @@ ADD_EXECUTABLE(${VOXELIZER_EXECUTABLE} ${SOURCES})
172163

173164
TARGET_COMPILE_FEATURES(${VOXELIZER_EXECUTABLE} PRIVATE cxx_std_17)
174165
TARGET_INCLUDE_DIRECTORIES(${VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_INCLUDE_DIR} ${GLM_INCLUDE_DIRS})
175-
TARGET_LINK_LIBRARIES(${VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_LIBRARY} PRIVATE glm::glm stdc++ stdc++fs)
166+
TARGET_LINK_LIBRARIES(${VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_LIBRARY} PRIVATE glm::glm OpenMP::OpenMP_CXX stdc++ stdc++fs)

0 commit comments

Comments
 (0)