From fa6dccc94e6ca1cea46a9bf5ed58e1d9f5c21746 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Tue, 7 Jan 2025 16:14:58 -0500 Subject: [PATCH] CMakeLists.txt update for macosx.gnu platform no changes from develop branch for the build.sh script --- CMakeLists.txt | 7 ++++++- build.sh | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 702cf6a459..2d962d0417 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -377,7 +377,12 @@ target_link_libraries(ufs PUBLIC "${_ufs_libs_public}") add_executable(ufs_model driver/UFS.F90) add_dependencies(ufs_model ufs) target_link_libraries(ufs_model ufs esmf w3emc::w3emc_d) -set_target_properties(ufs_model PROPERTIES LINKER_LANGUAGE Fortran) + +if(CMAKE_Platform MATCHES "macosx.gnu") + set_target_properties(ufs_model PROPERTIES LINKER_LANGUAGE CXX) +else() + set_target_properties(ufs_model PROPERTIES LINKER_LANGUAGE Fortran) +endif() ############################################################################### ### Install diff --git a/build.sh b/build.sh index f9f5189767..3f82a882da 100755 --- a/build.sh +++ b/build.sh @@ -13,10 +13,6 @@ export FC=${FC:-mpif90} BUILD_DIR=${BUILD_DIR:-${UFS_MODEL_DIR}/build} mkdir -p "${BUILD_DIR}" -if [[ "$(uname -s)" == "Darwin" ]]; then - gsed -i'.backup' "s:LINKER_LANGUAGE Fortran:LINKER_LANGUAGE CXX:" ./CMakeLists.txt -fi - cd "${BUILD_DIR}" ARR_CMAKE_FLAGS=() for i in ${CMAKE_FLAGS}; do ARR_CMAKE_FLAGS+=("${i}") ; done