From 674e79f8e6146ab4df834c0a3d4c75acf368c45e Mon Sep 17 00:00:00 2001 From: Samuel Farrens Date: Thu, 28 Mar 2019 18:29:41 +0100 Subject: [PATCH] openmp bug fix and clean up --- CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 765e250..97253bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,9 +25,11 @@ project(sparse2d) # Find OpenMP if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") - set(OpenMP_CXX_FLAGS "-fopenmp") + set(OpenMP_INCLUDE_PATH "/usr/local/include") + set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -lomp\ + -I${OpenMP_INCLUDE_PATH}") set(OpenMP_CXX_LIB_NAMES "omp") - set(OpenMP_CXX_LIBRARIES "/usr/local/opt/libomp/lib/libomp.dylib") + set(OpenMP_CXX_LIBRARIES "/usr/local/lib/libomp.dylib") else() find_package(OpenMP REQUIRED) endif() @@ -62,16 +64,18 @@ project(sparse2d) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") set(CMAKE_CXX_FLAGS_RELEASE "-DNO_DISP_IO -g0 -O2 -fPIC \ --fomit-frame-pointer -Xpreprocessor -fopenmp -lomp -Wno-write-strings -DNDEBUG ${FFTW_FLAGS}") - set(CMAKE_CXX_FLAGS_DEBUG "-DNO_DISP_IO -g -fPIC -Xpreprocessor -fopenmp -lomp\ +-fomit-frame-pointer ${OpenMP_CXX_FLAGS} -Wno-write-strings -DNDEBUG \ +${FFTW_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "-DNO_DISP_IO -g -fPIC ${OpenMP_CXX_FLAGS} \ -Wno-write-strings ${FFTW_CXX_FLAGS}") else() set(CMAKE_CXX_FLAGS_RELEASE "-DNO_DISP_IO -g0 -O2 -fPIC \ --fomit-frame-pointer -fopenmp -Wno-write-strings -DNDEBUG ${FFTW_FLAGS}" +-fomit-frame-pointer ${OpenMP_CXX_FLAGS} -Wno-write-strings -DNDEBUG \ +${FFTW_FLAGS}" ) - set(CMAKE_CXX_FLAGS_DEBUG "-DNO_DISP_IO -g -fPIC -fopenmp \ + set(CMAKE_CXX_FLAGS_DEBUG "-DNO_DISP_IO -g -fPIC ${OpenMP_CXX_FLAGS} \ -Wno-write-strings ${FFTW_CXX_FLAGS}" )