From ea542369936a56794b511b412193da930195586c Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Tue, 26 Mar 2024 13:46:14 -0600 Subject: [PATCH 1/3] CMake: openmp optional for FF and CPP if not explicitly requested --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f2b48a625..72457a4e2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,12 @@ include(${CMAKE_SOURCE_DIR}/cmake/set_rpath.cmake) #------------------------------------------------------------------------------- if (OPENMP OR BUILD_FASTFARM OR BUILD_OPENFAST_CPP_API) - FIND_PACKAGE(OpenMP REQUIRED) + if (OPENMP) + FIND_PACKAGE(OpenMP REQUIRED) + else() + # Optional for FF or the CPP interface + FIND_PACKAGE(OpenMP) + endif() if (OpenMP_Fortran_FOUND) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${OpenMP_Fortran_FLAGS}") link_libraries("${OpenMP_Fortran_LIBRARIES}") From 1741f73828ff715f2aefe4ea99a9cc92979c81f4 Mon Sep 17 00:00:00 2001 From: Andy Platt Date: Tue, 26 Mar 2024 14:01:16 -0600 Subject: [PATCH 2/3] Update CMakeLists.txt Co-authored-by: Derek Slaughter --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72457a4e2d..671a5dc0e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,10 @@ include(${CMAKE_SOURCE_DIR}/cmake/set_rpath.cmake) # OpenMP #------------------------------------------------------------------------------- -if (OPENMP OR BUILD_FASTFARM OR BUILD_OPENFAST_CPP_API) +if (OPENMP) + FIND_PACKAGE(OpenMP REQUIRED) +endif() +if (BUILD_FASTFARM OR BUILD_OPENFAST_CPP_API) if (OPENMP) FIND_PACKAGE(OpenMP REQUIRED) else() From e788f837745d9b61baed42dffee8a2ed2a51dba4 Mon Sep 17 00:00:00 2001 From: Andy Platt Date: Tue, 26 Mar 2024 14:01:23 -0600 Subject: [PATCH 3/3] Update CMakeLists.txt Co-authored-by: Derek Slaughter --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 671a5dc0e9..20297c27b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,12 +114,7 @@ if (OPENMP) FIND_PACKAGE(OpenMP REQUIRED) endif() if (BUILD_FASTFARM OR BUILD_OPENFAST_CPP_API) - if (OPENMP) - FIND_PACKAGE(OpenMP REQUIRED) - else() - # Optional for FF or the CPP interface - FIND_PACKAGE(OpenMP) - endif() + FIND_PACKAGE(OpenMP) if (OpenMP_Fortran_FOUND) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${OpenMP_Fortran_FLAGS}") link_libraries("${OpenMP_Fortran_LIBRARIES}")