Fix blake/weaver albany installs

sandialabs · Nov 1, 2024 · 7c8a1a4 · 7c8a1a4
1 parent 8eace87
commit 7c8a1a4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/doc/dashboards/blake.sandia.gov/ctest_nightly_albany-sfad_tmp.cmake b/doc/dashboards/blake.sandia.gov/ctest_nightly_albany-sfad_tmp.cmake
@@ -8,9 +8,11 @@ message("CTEST_BUILD_OPTION = " ${CTEST_BUILD_OPTION})
 execute_process(COMMAND bash delete_txt_files.sh 
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 set (TRILINOS_INSTALL "/home/projects/albany/nightlyCDashTrilinosBlake/build-gcc/TrilinosReleaseInstallGcc")
+set (CTEST_BUILD_TARGET all)
 IF(CTEST_BUILD_OPTION MATCHES "sfad6")
   set (SFAD_SIZE 6)
 ELSEIF(CTEST_BUILD_OPTION MATCHES "sfad12")
+  set (CTEST_BUILD_TARGET install) # install sfad12 for MALI
   set (SFAD_SIZE 12)
 ELSEIF(CTEST_BUILD_OPTION MATCHES "sfad16")
   set (SFAD_SIZE 16)
@@ -202,9 +204,6 @@ endif ()
 # Build the rest of Albany and install everything
 #
 
-#set (CTEST_BUILD_TARGET all)
-set (CTEST_BUILD_TARGET install)
-
 MESSAGE("\nBuilding target: '${CTEST_BUILD_TARGET}' ...\n")
 
 IF (SFAD_SIZE)

diff --git a/doc/dashboards/weaver.sandia.gov/ctest_nightly_albanySFAD_tmp.cmake b/doc/dashboards/weaver.sandia.gov/ctest_nightly_albanySFAD_tmp.cmake
@@ -14,9 +14,11 @@ set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
 execute_process(COMMAND bash delete_txt_files.sh 
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 set (TRILINOS_INSTALL "${CTEST_BINARY_DIRECTORY}/TrilinosInstall")
+set (CTEST_BUILD_TARGET all)
 IF(CTEST_BUILD_OPTION MATCHES "sfad6")
   set (SFAD_SIZE 6)
 ELSEIF(CTEST_BUILD_OPTION MATCHES "sfad12")
+  set (CTEST_BUILD_TARGET install) # install sfad12 for MALI
   set (SFAD_SIZE 12)
 ELSEIF(CTEST_BUILD_OPTION MATCHES "sfad16")
   set (SFAD_SIZE 16)
@@ -251,9 +253,6 @@ endif ()
 # Build the rest of Albany and install everything
 #
 
-set (CTEST_BUILD_TARGET all)
-#set (CTEST_BUILD_TARGET install)
-
 MESSAGE("\nBuilding target: '${CTEST_BUILD_TARGET}' ...\n")
 
 IF (SFAD_SIZE)

diff --git a/doc/dashboards/weaver.sandia.gov/ctest_nightly_albany_tmp.cmake b/doc/dashboards/weaver.sandia.gov/ctest_nightly_albany_tmp.cmake
@@ -48,6 +48,7 @@ set (CTEST_DROP_METHOD "https")
 execute_process(COMMAND bash delete_txt_files.sh 
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 set (TRILINOS_INSTALL "${CTEST_BINARY_DIRECTORY}/TrilinosInstall")
+set (ALBANY_INSTALL "${CTEST_BINARY_DIRECTORY}/AlbanyInstall")
 execute_process(COMMAND grep "Trilinos_C_COMPILER " ${TRILINOS_INSTALL}/lib64/cmake/Trilinos/TrilinosConfig.cmake
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 		RESULT_VARIABLE MPICC_RESULT
@@ -240,8 +241,8 @@ if (BUILD_ALBANY)
   # Build the rest of Albany and install everything
   #
 
-  set (CTEST_BUILD_TARGET all)
-  #set (CTEST_BUILD_TARGET install)
+  #set (CTEST_BUILD_TARGET all)
+  set (CTEST_BUILD_TARGET install)
 
   MESSAGE("\nBuilding target: '${CTEST_BUILD_TARGET}' ...\n")