Adjust MSVC OpenMP configuration

Author: allnes

cmake/openmp.cmake

@@ -1,12 +1,11 @@
+if(MSVC)
+  set(OpenMP_C_FLAGS "/openmp:llvm" CACHE STRING "OpenMP C flags" FORCE)
+  set(OpenMP_CXX_FLAGS "/openmp:llvm" CACHE STRING "OpenMP CXX flags" FORCE)
+endif()
+
 find_package(OpenMP)
 if(OpenMP_FOUND)
   include_directories(${OpenMP_C_INCLUDE_DIRS} ${OpenMP_CXX_INCLUDE_DIRS})
-
-  if(MSVC)
-    string(REPLACE "/openmp" "/openmp:llvm" OpenMP_C_FLAGS "${OpenMP_C_FLAGS}")
-    string(REPLACE "/openmp" "/openmp:llvm" OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS}")
-  endif()
-
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
   set(CMAKE_EXE_LINKER_FLAGS

modules/core/CMakeLists.txt

@@ -44,10 +44,6 @@ target_link_libraries(${exec_func_lib} PUBLIC gtest gtest_main)
 target_link_libraries(${exec_func_lib} PUBLIC Threads::Threads)
 
 find_package(OpenMP REQUIRED)
-if(MSVC)
-  string(REPLACE "/openmp" "/openmp:llvm" OpenMP_C_FLAGS "${OpenMP_C_FLAGS}")
-  string(REPLACE "/openmp" "/openmp:llvm" OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS}")
-endif()
 target_link_libraries(${exec_func_lib} PUBLIC ${OpenMP_libomp_LIBRARY}
                                               OpenMP::OpenMP_CXX)