From e2c761c6b1e8cdc17e27b8dd37f9dd7f11596648 Mon Sep 17 00:00:00 2001 From: Jamie Bresch Date: Wed, 10 Feb 2021 13:58:08 -0700 Subject: [PATCH 1/2] Add cmake option to not build OpenMP by default. --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 117464e5e1..b5bbc0cbaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,11 +18,13 @@ endif() option(MPAS_DOUBLE_PRECISION "Use double precision 64-bit Floating point." TRUE) option(MPAS_PROFILE "Enable GPTL profiling" OFF) option(BUILD_SHARED_LIBS "Build shared libraries" ON) +option(MPAS_OPENMP "Enable OpenMP" OFF) message(STATUS "[OPTION] MPAS_CORES: ${MPAS_CORES}") message(STATUS "[OPTION] MPAS_DOUBLE_PRECISION: ${MPAS_DOUBLE_PRECISION}") message(STATUS "[OPTION] MPAS_PROFILE: ${MPAS_PROFILE}") message(STATUS "[OPTION] BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") +message(STATUS "[OPTION] MPAS_OPENMP: ${MPAS_OPENMP}") # Build product output locations set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) @@ -100,7 +102,9 @@ macro(mpas_fortran_target _tgt) target_compile_definitions(${_tgt} PRIVATE USE_PIO2=1) # Enable OpenMP support - target_link_libraries(${_tgt} PUBLIC OpenMP::OpenMP_Fortran) + if(MPAS_OPENMP) + target_link_libraries(${_tgt} PUBLIC OpenMP::OpenMP_Fortran) + endif() # Compiler-specific options and flags if(CMAKE_Fortran_COMPILER_ID MATCHES GNU) From 9c2b213aea191936dcf1b250a51bd7c0dcf66b1a Mon Sep 17 00:00:00 2001 From: Jamie Bresch Date: Thu, 11 Feb 2021 14:41:29 -0700 Subject: [PATCH 2/2] cosmetic change --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5bbc0cbaa..44845b2899 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,14 +17,14 @@ if(MPAS_CORES MATCHES " ") #Convert strings separated with spaces to CMake list endif() option(MPAS_DOUBLE_PRECISION "Use double precision 64-bit Floating point." TRUE) option(MPAS_PROFILE "Enable GPTL profiling" OFF) -option(BUILD_SHARED_LIBS "Build shared libraries" ON) option(MPAS_OPENMP "Enable OpenMP" OFF) +option(BUILD_SHARED_LIBS "Build shared libraries" ON) message(STATUS "[OPTION] MPAS_CORES: ${MPAS_CORES}") message(STATUS "[OPTION] MPAS_DOUBLE_PRECISION: ${MPAS_DOUBLE_PRECISION}") message(STATUS "[OPTION] MPAS_PROFILE: ${MPAS_PROFILE}") -message(STATUS "[OPTION] BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") message(STATUS "[OPTION] MPAS_OPENMP: ${MPAS_OPENMP}") +message(STATUS "[OPTION] BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") # Build product output locations set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)