diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index c3e66291a6aeef59b267b4df4a7047c3d7d9c25c..94ee712b17ae31bb09b0f320cf053852cd1ef195 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -420,7 +420,7 @@ else()
     )
     include(${VTK_BINARY_DIR}/VTKConfig.cmake)
 endif()
-if(VTK_ADDED AND OPENMP_FOUND AND TARGET vtkFiltersStatistics)
+if(VTK_ADDED AND OpenMP_FOUND AND TARGET vtkFiltersStatistics)
     target_link_libraries(vtkFiltersStatistics PRIVATE OpenMP::OpenMP_C)
 endif()
 # end VTK ###
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 21823808df0226d9b85ab4f494431094d56a30b6..9ce4dc771c996856173e797edf53d6d3f8169fbc 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -49,14 +49,7 @@ if(OGS_USE_MFRONT)
 endif()
 find_package(Threads)
 
-find_package(OpenMP)
-if(OPENMP_FOUND)
-    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
-        "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}"
-    )
-endif()
+find_package(OpenMP COMPONENTS C CXX)
 
 # Qt5 library ##
 if(OGS_BUILD_GUI)
diff --git a/scripts/cmake/MetisSetup.cmake b/scripts/cmake/MetisSetup.cmake
index f9300fa7941879c9360e476e4b394f25925e352a..e443b121ec537262a295f176c127aaf499e53b10 100644
--- a/scripts/cmake/MetisSetup.cmake
+++ b/scripts/cmake/MetisSetup.cmake
@@ -28,7 +28,7 @@ include_directories(BEFORE ${METIS_PATH}/libmetis)
 file(GLOB metis_sources ${METIS_PATH}/libmetis/*.c)
 # Build libmetis.
 add_library(ogs_metis ${GKlib_sources} ${metis_sources})
-if(OPENMP_FOUND)
+if(OpenMP_FOUND)
     target_link_libraries(ogs_metis OpenMP::OpenMP_C)
 endif()
 if(BUILD_SHARED_LIBS)