Skip to content

Commit ac80299

Browse files
committed
Add IntelLLVM to CMake generator expressions where missing.
1 parent 0ab97d9 commit ac80299

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ if (OpenMP_FOUND)
195195
else ()
196196
# disable warning for unknown OpenMP pragmas if no OpenMP could be found
197197
target_compile_options(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC
198-
$<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:-Wno-unknown-pragmas>
198+
$<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang,IntelLLVM>:-Wno-unknown-pragmas>
199199
$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/wd4068>
200200
)
201201
# issue warning that multi-GPU execution will be serialized

bindings/Python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ target_link_libraries(${PLSSVM_PYTHON_BINDINGS_LIBRARY_NAME} PRIVATE ${PLSSVM_AL
126126
target_compile_definitions(${PLSSVM_PYTHON_BINDINGS_LIBRARY_NAME} PRIVATE PYBIND11_DETAILED_ERROR_MESSAGES)
127127

128128
# disable clang compiler warning
129-
target_compile_options(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-Wno-self-assign-overloaded>)
129+
target_compile_options(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC $<$<COMPILE_LANG_AND_ID:CXX,Clang,IntelLLVM>:-Wno-self-assign-overloaded>)
130130
target_compile_options(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC -fPIC)
131131

132132
# append pybind11 bindings library to installed targets

src/plssvm/backends/CUDA/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ set(CMAKE_CUDA_STANDARD 17)
4040
set(CMAKE_CUDA_STANDARD_REQUIRED ON)
4141

4242
if (CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
43+
message(STATUS "Using nvcc as CUDA compiler.")
4344
# use nvcc to compile CUDA code
4445
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler '-fPIC' -Xcudafe \"--diag_suppress=unsigned_compare_with_zero --diag_suppress=128\" -lineinfo")
4546
# build type specific flags
@@ -55,6 +56,7 @@ if (CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
5556
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler '-fopenmp'")
5657
endif ()
5758
elseif (CMAKE_CUDA_COMPILER_ID STREQUAL "Clang")
59+
message(STATUS "Using Clang as CUDA compiler.")
5860
# use clang to compile CUDA code
5961
# build type specific flags
6062
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Wall -Wextra -Wdouble-promotion -Wshadow -Wcast-qual -Wnull-dereference -Wextra-semi -Wunreachable-code -Wuninitialized -Wmost -Wconversion")

src/plssvm/backends/HPX/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ add_library(${PLSSVM_HPX_BACKEND_LIBRARY_NAME} SHARED ${PLSSVM_HPX_SOURCES})
4343
target_link_libraries(${PLSSVM_HPX_BACKEND_LIBRARY_NAME} PUBLIC HPX::hpx)
4444

4545
# additional compilation flags
46-
target_compile_options(${PLSSVM_HPX_BACKEND_LIBRARY_NAME} PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:-Wconversion>)
46+
target_compile_options(${PLSSVM_HPX_BACKEND_LIBRARY_NAME} PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang,IntelLLVM>:-Wconversion>)
4747

4848
# link base library against HPX library
4949
target_link_libraries(${PLSSVM_HPX_BACKEND_LIBRARY_NAME} PUBLIC ${PLSSVM_BASE_LIBRARY_NAME})

src/plssvm/backends/OpenMP/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ else ()
5252
endif ()
5353

5454
# additional compilation flags
55-
target_compile_options(${PLSSVM_OPENMP_BACKEND_LIBRARY_NAME} PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:-Wconversion>)
55+
target_compile_options(${PLSSVM_OPENMP_BACKEND_LIBRARY_NAME} PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang,IntelLLVM>:-Wconversion>)
5656

5757
# work-around since hipcc doesn't define _OPENMP
5858
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")

0 commit comments

Comments
 (0)