From c8b4ccecde9884a6d0514414237ab1b8d726a3b6 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Mon, 31 Oct 2022 14:59:42 +0100
Subject: [PATCH] Fix OpenMP issue on macosx
OpenMP comes with the proper targets which are used now.
---
reco/L1/CMakeLists.txt | 29 ++++-------------------------
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index f7012dd7b6..fb8aaa2aad 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -20,25 +20,6 @@ set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}/catools
)
-if (OPENMP_FOUND)
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- set(SYSTEM_INCLUDE_DIRECTORIES
- ${SYSTEM_INCLUDE_DIRECTORIES}
- ${OpenMP_CXX_INCLUDE_DIRS}
- )
-endif()
-
-
-if (OPENMP_FOUND AND APPLE)
- get_filename_component(OpenMP_CXX_LIBRARY_DIR ${OpenMP_CXX_LIBRARIES} DIRECTORY)
- Set(LINK_DIRECTORIES
- ${LINK_DIRECTORIES}
- ${OpenMP_CXX_LIBRARY_DIR}
- )
-endif()
-
-
set(SRCS
#L1Algo / L1CATrackFinder.cxx
#CbmL1Performance.cxx
@@ -176,6 +157,10 @@ set(PUBLIC_DEPENDENCIES
ROOT::Physics
)
+if(OpenMP_CXX_FOUND)
+ list(APPEND PUBLIC_DEPENDENCIES OpenMP::OpenMP_CXX)
+endif()
+
set(PRIVATE_DEPENDENCIES
CbmMuchBase
CbmMvd
@@ -199,14 +184,8 @@ set(PRIVATE_DEPENDENCIES
)
-if (OPENMP_FOUND AND APPLE)
- Set(DEPENDENCIES ${PUBLIC_DEPENDENCIES} ${PRIVATE_DEPENDENCIES} ${OpenMP_CXX_LIBRARIES}
- )
-endif()
-
generate_cbm_library()
-
install(FILES CbmL1Counters.h
L1Algo/L1Assert.h
L1Algo/L1EventEfficiencies.h
--
GitLab