diff --git a/CMakeLists.txt b/CMakeLists.txt
index eff2bcee..17a94617 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,13 +109,13 @@ find_package(FFTW3 REQUIRED)
 find_package(LibXml2 REQUIRED)
 
 #--- check for OpenMP ---------------------------------------------------------
-if (try_OpenMP AND NOT APPLE)
+if (try_OpenMP)
   find_package(OpenMP)
-  if (OpenMP_FOUND)
+  if (OpenMP_CXX_FOUND)
     add_definitions(-DHAVE_GOMP)
     set(HAVE_GOMP 1 CACHE INTERNAL "Have GOMP")
-  endif (OpenMP_FOUND)
-endif (try_OpenMP AND NOT APPLE)
+  endif (OpenMP_CXX_FOUND)
+endif (try_OpenMP)
 
 #--- check for Qt -------------------------------------------------------------
 if (qt_based_tools)
diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt
index a65935df..7d4afcaf 100644
--- a/src/classes/CMakeLists.txt
+++ b/src/classes/CMakeLists.txt
@@ -170,11 +170,6 @@ if (ROOT_GRTEQ_24)
   target_compile_options(PMusr BEFORE PRIVATE "-DROOT_GRTEQ_24")
 endif(ROOT_GRTEQ_24)
 
-#--- add OpenMP compile options if needed -------------------------------------
-if (OpenMP_FOUND)
-  target_compile_options(PMusr PUBLIC ${OpenMP_CXX_FLAGS})
-endif (OpenMP_FOUND)
-
 #--- add library dependencies -------------------------------------------------
 set(DependOnLibs ${ROOT_LIBARIES})
 #set(DependOnLibs ${DependOnLibs} ${FFTW3_LIBRARY})
@@ -189,11 +184,7 @@ if (nexus)
   set(DependOnLibs ${DependOnLibs} PNeXus)
 endif (nexus)
 if (OpenMP_FOUND)
-  if (OpenMP_CXX_LIBRARIES)
-    set(DependOnLibs ${DependOnLibs} ${OpenMP_CXX_LIBRARIES})
-  else (OpenMP_CXX_LIBRARIES)
-    set(DependOnLibs ${DependOnLibs} ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
-  endif (OpenMP_CXX_LIBRARIES)
+  set(DependOnLibs ${DependOnLibs} OpenMP::OpenMP_CXX)
 endif (OpenMP_FOUND)
 
 target_link_libraries(PUserFcnBase ${ROOT_LIBRARIES})
diff --git a/src/external/libFitPofB/classes/CMakeLists.txt b/src/external/libFitPofB/classes/CMakeLists.txt
index 07e92e83..dbf7ae6c 100644
--- a/src/external/libFitPofB/classes/CMakeLists.txt
+++ b/src/external/libFitPofB/classes/CMakeLists.txt
@@ -91,17 +91,9 @@ target_include_directories(
 )
 
 #--- add library dependencies -------------------------------------------------
-if (OpenMP_FOUND)
-  target_compile_options(FitPofB PUBLIC ${OpenMP_CXX_FLAGS})
-endif (OpenMP_FOUND)
-
 set(gomp "")
 if (OpenMP_FOUND)
-  if (OpenMP_CXX_LIBRARIES)
-    set(gomp ${OpenMP_CXX_LIBRARIES})
-  else (OpenMP_CXX_LIBRARIES)
-    set(gomp ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
-  endif (OpenMP_CXX_LIBRARIES)
+  set(gomp OpenMP::OpenMP_CXX)
 endif (OpenMP_FOUND)
 target_link_libraries(FitPofB 
     ${gomp}
diff --git a/src/external/libLFRelaxation/CMakeLists.txt b/src/external/libLFRelaxation/CMakeLists.txt
index 6392dcd9..2e2efd19 100644
--- a/src/external/libLFRelaxation/CMakeLists.txt
+++ b/src/external/libLFRelaxation/CMakeLists.txt
@@ -53,17 +53,9 @@ target_include_directories(
 )
 
 #--- add library dependencies -------------------------------------------------
-if (OpenMP_FOUND)
-  target_compile_options(LFRelaxation PUBLIC ${OpenMP_CXX_FLAGS})
-endif (OpenMP_FOUND)
-
 set(gomp "")
 if (OpenMP_FOUND)
-  if (OpenMP_CXX_LIBRARIES)
-    set(gomp ${OpenMP_CXX_LIBRARIES})
-  else (OpenMP_CXX_LIBRARIES)
-    set(gomp ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
-  endif (OpenMP_CXX_LIBRARIES)
+  set(gomp OpenMP::OpenMP_CXX)
 endif (OpenMP_FOUND)
 target_link_libraries(LFRelaxation 
    ${gomp}