Skip to content

Commit 9e34e11

Browse files
committed
Potentially fix CMAKE_CXX_COMPILER_ID handling.
1 parent 6d25024 commit 9e34e11

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ find_package(OpenMP QUIET)
217217
if (OpenMP_FOUND)
218218
message(STATUS "Found OpenMP ${OpenMP_CXX_VERSION} to speed-up library utilities (like file parsing).")
219219
set(PLSSVM_FOUND_OPENMP_FOR_UTILITY ON)
220-
if (${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
220+
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
221221
message(STATUS "Setting MSVC specific OpenMP flags.")
222222
target_compile_options(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC -openmp:llvm -openmp:experimental)
223223
target_link_libraries(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC -openmp:llvm -openmp:experimental)

src/plssvm/backends/Kokkos/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ target_link_libraries(${PLSSVM_KOKKOS_BACKEND_LIBRARY_NAME} PUBLIC Kokkos::kokko
3737

3838
if (Kokkos_ENABLE_SYCL)
3939
# set SYCL (icpx) specific compilation flags
40-
if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "IntelLLVM")
40+
if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
4141
message(FATAL_ERROR "For Kokkos::SYCL to work, the compiler must be IntelLLVM, but is ${CMAKE_CXX_COMPILER}!")
4242
endif ()
4343

src/plssvm/backends/OpenMP/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ set_local_and_parent(PLSSVM_OPENMP_BACKEND_LIBRARY_NAME plssvm-OpenMP)
3838
add_library(${PLSSVM_OPENMP_BACKEND_LIBRARY_NAME} SHARED ${PLSSVM_OPENMP_SOURCES})
3939

4040
# link against OpenMP
41-
if (${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
41+
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
4242
# ~~~
4343
# special command line options for MSVC:
4444
# - openmp:llvm -> enables unsigned loop indexes in OpenMP parallel for loops
@@ -53,7 +53,7 @@ endif ()
5353
target_compile_options(${PLSSVM_OPENMP_BACKEND_LIBRARY_NAME} PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang,IntelLLVM>:-Wconversion>)
5454

5555
# work-around since hipcc doesn't define _OPENMP
56-
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
56+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
5757
# hipcc must be clang
5858
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE PLSSVM_CLANG_VERSION_OUTPUT)
5959
# check if version message contains hipcc specific values

src/plssvm/backends/SYCL/DPCPP/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ message(CHECK_START "Checking for DPC++ as SYCL implementation")
88

99
# check if current compiler is Intel's clang llvm fork aka DPC++
1010
set(PLSSVM_SYCL_BACKEND_CHECK_FOR_DPCPP_COMPILER OFF)
11-
if (${CMAKE_CXX_COMPILER_ID} MATCHES "IntelLLVM")
11+
if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
1212
message(STATUS "Found Intel icpx compiler.")
1313
set(PLSSVM_SYCL_BACKEND_CHECK_FOR_DPCPP_COMPILER ON)
14-
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
14+
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1515
# intel llvm fork must be clang
1616
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --help OUTPUT_VARIABLE PLSSVM_DPCPP_CLANG_HELP_OUTPUT)
1717
# check if help message contains DPC++ specific values

0 commit comments

Comments
 (0)