From 8666c92c6cb31065904efb4f22a74e4b3b0f23a7 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 2 Oct 2024 07:35:17 -0600 Subject: [PATCH] Fix Fortan -> Fortran typo Signed-off-by: Samuel E. Browne --- commonTools/buildTools/external/makefileSupport.mak | 2 +- packages/TrilinosInstallTests/CMakeLists.txt | 8 ++++---- packages/zoltan/config/zac_arg_config_mpi.m4 | 2 +- packages/zoltan/configure | 2 +- packages/zoltan/docs/dev_html/dev_view.html | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/commonTools/buildTools/external/makefileSupport.mak b/commonTools/buildTools/external/makefileSupport.mak index 11b8849e0e63..b4788d29b5c4 100644 --- a/commonTools/buildTools/external/makefileSupport.mak +++ b/commonTools/buildTools/external/makefileSupport.mak @@ -78,7 +78,7 @@ EXTERNAL_INCLUDES += $(EXTERNAL_INCL_DIR) # Linker Options EXTERNAL_LDFLAGS = $(TEUCHOS_LDFLAGS) $(TEUCHOS_LIBS) -# EXTERNAL_C, EXTERNAL_C++ and Fortan compiler options +# EXTERNAL_C, EXTERNAL_C++ and Fortran compiler options EXTERNAL_CFLAGS = $(TEUCHOS_CFLAGS) EXTERNAL_CXXFLAGS = $(TEUCHOS_CXXFLAGS) diff --git a/packages/TrilinosInstallTests/CMakeLists.txt b/packages/TrilinosInstallTests/CMakeLists.txt index 4f7767a56e49..9592aad4d8de 100644 --- a/packages/TrilinosInstallTests/CMakeLists.txt +++ b/packages/TrilinosInstallTests/CMakeLists.txt @@ -58,7 +58,7 @@ tribits_add_advanced_test(reduced_tarball -D${CMAKE_PROJECT_NAME}_CONFIGURE_OPTIONS_FILE=${${CMAKE_PROJECT_NAME}_CONFIGURE_OPTIONS_FILE} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER} + -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -D${CMAKE_PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON -D${CMAKE_PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES=OFF ../trilinos-${Trilinos_VERSION}-Source @@ -112,7 +112,7 @@ tribits_add_advanced_test(simpleBuildAgainstTrilinos_by_package_build_tree ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER} + -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -DCMAKE_PREFIX_PATH=${PROJECT_BINARY_DIR}/cmake_packages -DCMAKE_BUILD_TYPE=DEBUG simpleBuildAgainstTrilinos @@ -191,7 +191,7 @@ tribits_add_advanced_test(find_package_Trilinos ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER} + -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -DCMAKE_PREFIX_PATH=${PROJECT_BINARY_DIR}/install ${CMAKE_CURRENT_SOURCE_DIR}/find_package_Trilinos PASS_REGULAR_EXPRESSION_ALL @@ -234,7 +234,7 @@ tribits_add_advanced_test(simpleBuildAgainstTrilinos ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER} + -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -DCMAKE_PREFIX_PATH=${PROJECT_BINARY_DIR}/install -DCMAKE_BUILD_TYPE=DEBUG ${PROJECT_SOURCE_DIR}/demos/simpleBuildAgainstTrilinos diff --git a/packages/zoltan/config/zac_arg_config_mpi.m4 b/packages/zoltan/config/zac_arg_config_mpi.m4 index 796d38bd6a58..aa56a332b5de 100644 --- a/packages/zoltan/config/zac_arg_config_mpi.m4 +++ b/packages/zoltan/config/zac_arg_config_mpi.m4 @@ -177,7 +177,7 @@ if test X${SEEK_MPI_COMPILERS} = Xyes; then # F77=${MPI_F77} # else # echo "-----" -# echo "Cannot find MPI Fortan 77 compiler." +# echo "Cannot find MPI Fortran 77 compiler." # echo "Specify a path to all mpi compilers with --with-mpi-compilers=PATH," # echo "or specify a path to top mpi directory (above bin) with --with-mpi=PATH," # echo "or specify a fortran 77 compiler using F77=" diff --git a/packages/zoltan/configure b/packages/zoltan/configure index c0f33f40bacf..4d6a7db6f539 100755 --- a/packages/zoltan/configure +++ b/packages/zoltan/configure @@ -3333,7 +3333,7 @@ test -n "$MPI_CXX" || MPI_CXX="notFound" # F77=${MPI_F77} # else # echo "-----" -# echo "Cannot find MPI Fortan 77 compiler." +# echo "Cannot find MPI Fortran 77 compiler." # echo "Specify a path to all mpi compilers with --with-mpi-compilers=PATH," # echo "or specify a path to top mpi directory (above bin) with --with-mpi=PATH," # echo "or specify a fortran 77 compiler using F77=" diff --git a/packages/zoltan/docs/dev_html/dev_view.html b/packages/zoltan/docs/dev_html/dev_view.html index d379704727f9..275c2add7255 100644 --- a/packages/zoltan/docs/dev_html/dev_view.html +++ b/packages/zoltan/docs/dev_html/dev_view.html @@ -111,7 +111,7 @@

any value p. Note that since the window may be resized with the mouse, you may not need image height and image width unless you must have a very specific window size. Also note that if you -ran the Fortan test driver zfdrive, you will need to rename the +ran the Fortran test driver zfdrive, you will need to rename the output files from file_name.fout.p.n to file_name.out.p.n.