From e09c51fa6dc533d114af1f76062b1367de1a1f10 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 21 Jan 2021 23:22:41 -0700 Subject: [PATCH 1/2] Update dev build script for new environment file naming conventions --- devbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devbuild.sh b/devbuild.sh index 9c4eecf64c..6edcc5495b 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -35,7 +35,7 @@ if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then exit 0 fi -ENV_FILE="docs/README_${PLATFORM}_${COMPILER}.txt" +ENV_FILE="env/build_${PLATFORM}_${COMPILER}.env" if [ ! -f "$ENV_FILE" ]; then echo "ERROR: environment file ($ENV_FILE) does not exist for this platform/compiler combination" echo "PLATFORM=$PLATFORM" From 7c3c742f79e79ef75c9acedfbbbe707a1acb0a5e Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 21 Jan 2021 23:24:31 -0700 Subject: [PATCH 2/2] Add BUILD_ALWAYS TRUE to CMakeLists.txt so that changes to source code are seen by make when rebuilding --- src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a0951648a0..0389260826 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,7 @@ ExternalProject_Add(UFS_UTILS SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/UFS_UTILS INSTALL_DIR ${CMAKE_INSTALL_PREFIX} CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + BUILD_ALWAYS TRUE ) if(NOT CCPP_SUITES) @@ -22,6 +23,7 @@ ExternalProject_Add(ufs_weather_model "-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}" "-DNETCDF_DIR=$ENV{NETCDF}" INSTALL_COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/bin && cp ${CMAKE_CURRENT_BINARY_DIR}/ufs_weather_model/src/ufs_weather_model-build/NEMS.exe ${CMAKE_INSTALL_PREFIX}/bin/ + BUILD_ALWAYS TRUE ) ExternalProject_Add(EMC_post @@ -29,4 +31,5 @@ ExternalProject_Add(EMC_post SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/EMC_post INSTALL_DIR ${CMAKE_INSTALL_PREFIX} CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + BUILD_ALWAYS TRUE )