From 44f676147ec1f4671a99cbd0d29f9090878433f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 15 Feb 2022 09:52:58 +0100
Subject: [PATCH] Cleanup OpenMP detection
---
VCI/VCICommon.cmake | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/VCI/VCICommon.cmake b/VCI/VCICommon.cmake
index 1bbacca..e21a4b3 100644
--- a/VCI/VCICommon.cmake
+++ b/VCI/VCICommon.cmake
@@ -117,26 +117,21 @@ endmacro ()
# test for OpenMP
macro (vci_openmp)
- if (NOT OPENMP_NOTFOUND)
- # Set off OpenMP on Darwin architectures
- # since it causes crashes sometimes
-# if(NOT APPLE)
- find_package(OpenMP)
- if (OPENMP_FOUND)
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- add_definitions(-DUSE_OPENMP)
-
- # export includes and libraries for usage within openflipper plugins
- set(OPENMP_INCLUDE_DIRS ${OpenMP_CXX_INCLUDE_DIR})
- set(OPENMP_LIBRARIES ${OpenMP_libomp_LIBRARY})
-# else ()
-# set (OPENMP_NOTFOUND 1)
-# endif ()
+ if (NOT OPENMP_FOUND)
+ find_package(OpenMP)
+ if (OPENMP_FOUND)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+ add_definitions(-DUSE_OPENMP)
+
+ # export includes and libraries for usage within openflipper plugins
+ set(OPENMP_INCLUDE_DIRS ${OpenMP_CXX_INCLUDE_DIR})
+ set(OPENMP_LIBRARIES ${OpenMP_libomp_LIBRARY})
endif()
- endif ()
+ endif()
endmacro ()
+
# append all files with extension "ext" in the "dirs" directories to "ret"
# excludes all files starting with a '.' (dot)
macro (vci_append_files ret ext)
--
GitLab