diff --git a/.appveyor.yml b/.appveyor.yml index 5e809c0ef7..5f25c71e51 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -57,16 +57,16 @@ build_script: -DNetCDF_ROOT:PATH=%LIB_ROOT% ^ -DSEACASExodus_ENABLE_THREADSAFE:BOOL=OFF ^ -DSEACASIoss_ENABLE_THREADSAFE:BOOL=OFF ^ - -DSEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON ^ - -DSEACASProj_ENABLE_ALL_PACKAGES:BOOL=ON ^ - -DSEACASProj_ENABLE_DOXYGEN:BOOL=OFF ^ - -DSEACASProj_ENABLE_Fortran=OFF ^ - -DSEACASProj_ENABLE_SEACAS:BOOL=ON ^ - -DSEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON ^ - -DSEACASProj_ENABLE_TESTS=ON ^ - -DSEACASProj_ENABLE_Zoltan:BOOL=OFF ^ - -DSEACASProj_HIDE_DEPRECATED_CODE:BOOL=ON ^ - -DSEACASProj_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON ^ + -DSeacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON ^ + -DSeacas_ENABLE_ALL_PACKAGES:BOOL=ON ^ + -DSeacas_ENABLE_DOXYGEN:BOOL=OFF ^ + -DSeacas_ENABLE_Fortran=OFF ^ + -DSeacas_ENABLE_SEACAS:BOOL=ON ^ + -DSeacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON ^ + -DSeacas_ENABLE_TESTS=ON ^ + -DSeacas_ENABLE_Zoltan:BOOL=OFF ^ + -DSeacas_HIDE_DEPRECATED_CODE:BOOL=ON ^ + -DSeacas_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON ^ -DTPL_ENABLE_ADIOS2:BOOL=OFF ^ -DTPL_ENABLE_CGNS:BOOL=OFF ^ -DTPL_ENABLE_Kokkos:BOOL=OFF ^ diff --git a/.gitignore b/.gitignore index 2c785d383f..e8ff35b8d0 100644 --- a/.gitignore +++ b/.gitignore @@ -110,7 +110,7 @@ SNTools.project *.settings *ioss.doxygen.warn *ioss.tags -SEACASProjRepoVersion.txt +SeacasRepoVersion.txt TPL/adios2/ADIOS2/ TPL/cgns/CGNS/ TPL/data-warehouse-release diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c1ee34073..7c9a2c3b38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ # We set the project name in a separate file so CTest scripts can use it. INCLUDE(${CMAKE_SOURCE_DIR}/ProjectName.cmake) -SET(SEACASProj_ENABLE_CXX11_DEFAULT ON) -SET(SEACASProj_ENABLE_Zoltan_DEFAULT ON) +SET(Seacas_ENABLE_CXX11_DEFAULT ON) +SET(Seacas_ENABLE_Zoltan_DEFAULT ON) # Define the TriBITS minimum required CMake version SET(TRIBITS_CMAKE_MINIMUM_REQUIRED 3.17.0) @@ -40,7 +40,7 @@ SET(${PROJECT_NAME}_EXCLUDE_DISABLED_SUBPACKAGES_FROM_DISTRIBUTION_DEFAULT FALSE SET(TPL_ENABLE_Pthread OFF CACHE BOOL "") -OPTION(SEACASProj_ENABLE_DOXYGEN "Enable Doxygen documentation creation." OFF) +OPTION(Seacas_ENABLE_DOXYGEN "Enable Doxygen documentation creation." OFF) # Do all of the processing for this Tribits project TRIBITS_PROJECT() diff --git a/PackagesList.cmake b/PackagesList.cmake index d60cf718be..9eaa69ba73 100644 --- a/PackagesList.cmake +++ b/PackagesList.cmake @@ -1,5 +1,5 @@ # -# Define the SEACASProj packages +# Define the Seacas packages # TRIBITS_REPOSITORY_DEFINE_PACKAGES( Zoltan packages/zoltan PT diff --git a/ProjectName.cmake b/ProjectName.cmake index 132a4c04fb..00a63c831f 100644 --- a/ProjectName.cmake +++ b/ProjectName.cmake @@ -1,5 +1,5 @@ # Must set the project name at very beginning before including anything else -SET(PROJECT_NAME SEACASProj) +SET(PROJECT_NAME Seacas) # Turn on export dependency generation for WrapExteranl package SET(${PROJECT_NAME}_GENERATE_EXPORT_FILE_DEPENDENCIES_DEFAULT ON) diff --git a/README-KOKKOS.md b/README-KOKKOS.md index 62f80af1a0..bbff2bda5c 100644 --- a/README-KOKKOS.md +++ b/README-KOKKOS.md @@ -32,7 +32,7 @@ If using your own cmake script or directly calling cmake, be sure to do the foll If using CUDA as the backend, OpenMP can still be enabled. ```bash --D SEACASProj_ENABLE_OpenMP:Bool=ON +-D Seacas_ENABLE_OpenMP:Bool=ON -D TPL_ENABLE_Pthread:Bool=OFF ``` diff --git a/README.md b/README.md index 26522197e2..5e814ee7ca 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ parallel capability enabled (if applicable). You can then continue with the steps outlined in the previous section. ## Testing -There are a few unit tests for zoltan, exodus, ioss, and aprepro that can be run via `make test` or `ctest` if you configured with `-D SEACASProj_ENABLE_TESTS=YES`. +There are a few unit tests for zoltan, exodus, ioss, and aprepro that can be run via `make test` or `ctest` if you configured with `-D Seacas_ENABLE_TESTS=YES`. There is also a system-level test that just verifies that the applications can read and write exodus files correctly. This test runs off of the installed applications. To run do: diff --git a/TPLsList.cmake b/TPLsList.cmake index 01b3004337..ca33da235d 100644 --- a/TPLsList.cmake +++ b/TPLsList.cmake @@ -52,7 +52,7 @@ # such dependencies exist). # -SET( SEACASProj_TPLS_FINDMODS_CLASSIFICATIONS +SET( Seacas_TPLS_FINDMODS_CLASSIFICATIONS GTest "cmake/TPLs/" PT Zlib "cmake/TPLs/" SS HDF5 "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" SS diff --git a/Version.cmake b/Version.cmake index a178fdec31..a5c0f08cf4 100644 --- a/Version.cmake +++ b/Version.cmake @@ -1,5 +1,5 @@ -SET(SEACASProj_VERSION 2.0) -SET(SEACASProj_MAJOR_VERSION 2) -SET(SEACASProj_MAJOR_MINOR_VERSION 020000) -SET(SEACASProj_VERSION_STRING "2.0 (Dev)") -SET(SEACASProj_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release +SET(Seacas_VERSION 2.0) +SET(Seacas_MAJOR_VERSION 2) +SET(Seacas_MAJOR_MINOR_VERSION 020000) +SET(Seacas_VERSION_STRING "2.0 (Dev)") +SET(Seacas_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release diff --git a/cmake-config b/cmake-config index 843bb2a5b4..a7249433fe 100755 --- a/cmake-config +++ b/cmake-config @@ -168,61 +168,61 @@ fi if [ "${APPLICATIONS}" == "YES" ] && [ "${LEGACY}" == "YES" ] then - SUBSET_OPTIONS="-DSEACASProj_ENABLE_ALL_PACKAGES:BOOL=ON \ - -DSEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ - -DSEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON" + SUBSET_OPTIONS="-DSeacas_ENABLE_ALL_PACKAGES:BOOL=ON \ + -DSeacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ + -DSeacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON" else - SUBSET_OPTIONS="-DSEACASProj_ENABLE_ALL_PACKAGES:BOOL=OFF \ - -DSEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \ - -DSEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=OFF \ - -DSEACASProj_ENABLE_SEACASIoss:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExodus:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExodus_for:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExoIIv2for32:BOOL=ON" + SUBSET_OPTIONS="-DSeacas_ENABLE_ALL_PACKAGES:BOOL=OFF \ + -DSeacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \ + -DSeacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=OFF \ + -DSeacas_ENABLE_SEACASIoss:BOOL=ON \ + -DSeacas_ENABLE_SEACASExodus:BOOL=ON \ + -DSeacas_ENABLE_SEACASExodus_for:BOOL=ON \ + -DSeacas_ENABLE_SEACASExoIIv2for32:BOOL=ON" if [ "${APPLICATIONS}" == "YES" ] then SUBSET_OPTIONS="${SUBSET_OPTIONS} \ - -DSEACASProj_ENABLE_SEACASAprepro:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASAprepro_lib:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASConjoin:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASCpup:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEjoin:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEpu:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExo2mat:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExo_format:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExodiff:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASMat2exo:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASNemslice:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASSlice:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASZellij:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASNemspread:BOOL=ON" + -DSeacas_ENABLE_SEACASAprepro:BOOL=ON \ + -DSeacas_ENABLE_SEACASAprepro_lib:BOOL=ON \ + -DSeacas_ENABLE_SEACASConjoin:BOOL=ON \ + -DSeacas_ENABLE_SEACASCpup:BOOL=ON \ + -DSeacas_ENABLE_SEACASEjoin:BOOL=ON \ + -DSeacas_ENABLE_SEACASEpu:BOOL=ON \ + -DSeacas_ENABLE_SEACASExo2mat:BOOL=ON \ + -DSeacas_ENABLE_SEACASExo_format:BOOL=ON \ + -DSeacas_ENABLE_SEACASExodiff:BOOL=ON \ + -DSeacas_ENABLE_SEACASMat2exo:BOOL=ON \ + -DSeacas_ENABLE_SEACASNemslice:BOOL=ON \ + -DSeacas_ENABLE_SEACASSlice:BOOL=ON \ + -DSeacas_ENABLE_SEACASZellij:BOOL=ON \ + -DSeacas_ENABLE_SEACASNemspread:BOOL=ON" if [ "${FORTRAN}" == "YES" ] then SUBSET_OPTIONS="${SUBSET_OPTIONS} \ - -DSEACASProj_ENABLE_SEACASExplore:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGrepos:BOOL=ON" + -DSeacas_ENABLE_SEACASExplore:BOOL=ON \ + -DSeacas_ENABLE_SEACASGrepos:BOOL=ON" fi elif [ "${LEGACY}" == "YES" ] && [ "${FORTRAN}" == "YES" ] then SUBSET_OPTIONS="${SUBSET_OPTIONS} \ - -DSEACASProj_ENABLE_SEACASAlgebra:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASBlot:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEx1ex2v2:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEx2ex1v2:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExomatlab:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExotec2:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExotxt:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASFastq:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGen3D:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGenshell:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGjoin:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASMapvar:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASMapvar-kd:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASNemesis:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASTxtexo:BOOL=ON" + -DSeacas_ENABLE_SEACASAlgebra:BOOL=ON \ + -DSeacas_ENABLE_SEACASBlot:BOOL=ON \ + -DSeacas_ENABLE_SEACASEx1ex2v2:BOOL=ON \ + -DSeacas_ENABLE_SEACASEx2ex1v2:BOOL=ON \ + -DSeacas_ENABLE_SEACASExomatlab:BOOL=ON \ + -DSeacas_ENABLE_SEACASExotec2:BOOL=ON \ + -DSeacas_ENABLE_SEACASExotxt:BOOL=ON \ + -DSeacas_ENABLE_SEACASFastq:BOOL=ON \ + -DSeacas_ENABLE_SEACASGen3D:BOOL=ON \ + -DSeacas_ENABLE_SEACASGenshell:BOOL=ON \ + -DSeacas_ENABLE_SEACASGjoin:BOOL=ON \ + -DSeacas_ENABLE_SEACASMapvar:BOOL=ON \ + -DSeacas_ENABLE_SEACASMapvar-kd:BOOL=ON \ + -DSeacas_ENABLE_SEACASNemesis:BOOL=ON \ + -DSeacas_ENABLE_SEACASTxtexo:BOOL=ON" fi fi @@ -246,7 +246,7 @@ SHARED=$(check_valid SHARED) if [ "${CRAY}" == "YES" ] && [ "${SHARED}" == "NO" ] then # Assumes we build our own static zlib with CRAY - EXTRA_LIB=-DSEACASProj_EXTRA_LINK_FLAGS=${INSTALL_PATH}/lib/libz.a + EXTRA_LIB=-DSeacas_EXTRA_LINK_FLAGS=${INSTALL_PATH}/lib/libz.a fi ### Switch for Debug or Release build: @@ -285,7 +285,7 @@ THREADSAFE=${THREADSAFE:-NO} THREADSAFE=$(check_valid THREADSAFE) if [ "$THREADSAFE" == "YES" ] ; then - THREAD_SAFE_OPT="-DSEACASProj_EXTRA_LINK_FLAGS=-lpthread" + THREAD_SAFE_OPT="-DSeacas_EXTRA_LINK_FLAGS=-lpthread" fi @@ -358,7 +358,7 @@ then LD_EXT="so" fi else - EXTRA_LIB="-DSEACASProj_EXTRA_LINK_FLAGS=z;dl -DSEACASExodus_ENABLE_SHARED:BOOL=OFF" + EXTRA_LIB="-DSeacas_EXTRA_LINK_FLAGS=z;dl -DSEACASExodus_ENABLE_SHARED:BOOL=OFF" LD_EXT="a" fi @@ -421,7 +421,7 @@ fi ### You can add these below if you want more verbosity... #-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -#-D SEACASProj_VERBOSE_CONFIGURE=ON \ +#-D Seacas_VERBOSE_CONFIGURE=ON \ ### You can add these below to regenerate the flex and bison files for ### aprepro and aprepro_lib May have to touch aprepro.l aprepro.y @@ -462,19 +462,19 @@ cmake -G "${GENERATOR}" \ -D CMAKE_CXX_FLAGS="${CXXFLAGS} ${CXX_WARNING_FLAGS} ${SANITIZE}" \ -D CMAKE_C_FLAGS="${CFLAGS} ${C_WARNING_FLAGS} ${SANITIZE}" \ -D CMAKE_Fortran_FLAGS="${FFLAGS} ${F77_WARNING_FLAGS} ${SANITIZE}" \ --D SEACASProj_ENABLE_STRONG_C_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ --D SEACASProj_ENABLE_STRONG_CXX_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ +-D Seacas_ENABLE_STRONG_C_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ +-D Seacas_ENABLE_STRONG_CXX_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ -D CMAKE_INSTALL_RPATH:PATH=${INSTALL_PATH}/lib \ -D BUILD_SHARED_LIBS:BOOL=${SHARED} \ -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \ ${SUBSET_OPTIONS} \ --D SEACASProj_ENABLE_Zoltan:BOOL=${ZOLTAN} \ --D SEACASProj_ENABLE_TESTS=ON \ +-D Seacas_ENABLE_Zoltan:BOOL=${ZOLTAN} \ +-D Seacas_ENABLE_TESTS=ON \ -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \ --D SEACASProj_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ --D SEACASProj_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ --D SEACASProj_ENABLE_DOXYGEN:BOOL=${DOXYGEN} \ --D SEACASProj_ENABLE_Fortran=${FORTRAN} \ +-D Seacas_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ +-D Seacas_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ +-D Seacas_ENABLE_DOXYGEN:BOOL=${DOXYGEN} \ +-D Seacas_ENABLE_Fortran=${FORTRAN} \ ${EXTRA_LIB} \ \ -D TPL_ENABLE_Netcdf:BOOL=${HAVE_NETCDF} \ diff --git a/cmake-config-kokkos b/cmake-config-kokkos index bd8a5ee3a0..dc8f88e144 100755 --- a/cmake-config-kokkos +++ b/cmake-config-kokkos @@ -40,7 +40,7 @@ then else export OMPI_CXX=`which gcc` unset CUDA_MANAGED_FORCE_DEVICE_ALLOC - KOKKOS_SYMBOLS="-D SEACASProj_ENABLE_OpenMP:Bool=ON -D TPL_ENABLE_Pthread:Bool=OFF" + KOKKOS_SYMBOLS="-D Seacas_ENABLE_OpenMP:Bool=ON -D TPL_ENABLE_Pthread:Bool=OFF" fi @@ -61,15 +61,15 @@ cmake \ -D CMAKE_INSTALL_RPATH:PATH=${INSTALL_PATH}/lib \ -D BUILD_SHARED_LIBS:BOOL=ON \ -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \ --D SEACASProj_ENABLE_ALL_PACKAGES:BOOL=ON \ --D SEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ --D SEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON \ --D SEACASProj_ENABLE_TESTS=ON \ +-D Seacas_ENABLE_ALL_PACKAGES:BOOL=ON \ +-D Seacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ +-D Seacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON \ +-D Seacas_ENABLE_TESTS=ON \ -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \ -D CMAKE_CXX_COMPILER:FILEPATH=${CXX} \ -D CMAKE_C_COMPILER:FILEPATH=${CC} \ -D CMAKE_Fortran_COMPILER:FILEPATH=${FC} \ --D SEACASProj_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ +-D Seacas_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ \ -D TPL_ENABLE_Netcdf:BOOL=ON \ -D TPL_ENABLE_Matio:BOOL=ON \ diff --git a/cmake-exodus b/cmake-exodus index 7ff74958e3..4f1724de14 100755 --- a/cmake-exodus +++ b/cmake-exodus @@ -158,7 +158,7 @@ SHARED=$(check_valid SHARED) if [ "${CRAY}" == "YES" ] && [ "${SHARED}" == "NO" ] then # Assumes we build our own static zlib with CRAY - CRAY_OPT=-DSEACASProj_EXTRA_LINK_FLAGS=${INSTALL_PATH}/lib/libz.a + CRAY_OPT=-DSeacas_EXTRA_LINK_FLAGS=${INSTALL_PATH}/lib/libz.a fi ### Switch for Debug or Release build: @@ -191,7 +191,7 @@ THREADSAFE=${THREADSAFE:-NO} THREADSAFE=$(check_valid THREADSAFE) if [ "$THREADSAFE" == "YES" ] ; then - THREAD_SAFE_OPT="-DSEACASProj_EXTRA_LINK_FLAGS=-lpthread" + THREAD_SAFE_OPT="-DSeacas_EXTRA_LINK_FLAGS=-lpthread" fi function check_enable() @@ -288,7 +288,7 @@ fi ### You can add these below if you want more verbosity... #-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -#-D SEACASProj_VERBOSE_CONFIGURE=ON \ +#-D Seacas_VERBOSE_CONFIGURE=ON \ ### You can add these below to regenerate the flex and bison files for ### aprepro and aprepro_lib May have to touch aprepro.l aprepro.y @@ -328,20 +328,20 @@ cmake -G "${GENERATOR}" \ -D CMAKE_CXX_FLAGS="${CXXFLAGS} ${CXX_WARNING_FLAGS} ${SANITIZE}" \ -D CMAKE_C_FLAGS="${CFLAGS} ${C_WARNING_FLAGS} ${SANITIZE}" \ -D CMAKE_Fortran_FLAGS="${FFLAGS} ${F77_WARNING_FLAGS} ${SANITIZE}" \ --D SEACASProj_ENABLE_STRONG_C_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ --D SEACASProj_ENABLE_STRONG_CXX_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ +-D Seacas_ENABLE_STRONG_C_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ +-D Seacas_ENABLE_STRONG_CXX_COMPILE_WARNINGS=${EXTRA_WARNINGS} \ -D CMAKE_INSTALL_RPATH:PATH=${INSTALL_PATH}/lib \ -D BUILD_SHARED_LIBS:BOOL=${SHARED} \ -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \ --D SEACASProj_ENABLE_SEACASExodus=YES \ --D SEACASProj_ENABLE_SEACASExodus_for=${FORTRAN} \ --D SEACASProj_ENABLE_SEACASExoIIv2for32=${FORTRAN} \ --D SEACASProj_ENABLE_TESTS=YES \ +-D Seacas_ENABLE_SEACASExodus=YES \ +-D Seacas_ENABLE_SEACASExodus_for=${FORTRAN} \ +-D Seacas_ENABLE_SEACASExoIIv2for32=${FORTRAN} \ +-D Seacas_ENABLE_TESTS=YES \ -D SEACASExodus_ENABLE_STATIC:BOOL=${STATIC} \ -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \ --D SEACASProj_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=YES \ --D SEACASProj_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ --D SEACASProj_ENABLE_Fortran=${FORTRAN} \ +-D Seacas_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=YES \ +-D Seacas_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ +-D Seacas_ENABLE_Fortran=${FORTRAN} \ ${CRAY_OPT} \ \ -D TPL_ENABLE_Netcdf:BOOL=${HAVE_NETCDF} \ diff --git a/cmake-faodel b/cmake-faodel index 34db8e8a6e..09dd55587b 100755 --- a/cmake-faodel +++ b/cmake-faodel @@ -87,58 +87,58 @@ fi if [ "${APPLICATIONS}" == "YES" ] && [ "${LEGACY}" == "YES" ] then - SUBSET_OPTIONS="-DSEACASProj_ENABLE_ALL_PACKAGES:BOOL=ON \ - -DSEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ - -DSEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON" + SUBSET_OPTIONS="-DSeacas_ENABLE_ALL_PACKAGES:BOOL=ON \ + -DSeacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ + -DSeacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON" else - SUBSET_OPTIONS="-DSEACASProj_ENABLE_ALL_PACKAGES:BOOL=OFF \ - -DSEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \ - -DSEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=OFF \ - -DSEACASProj_ENABLE_SEACASIoss:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExodus:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExodus_for:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExoIIv2for32:BOOL=ON" + SUBSET_OPTIONS="-DSeacas_ENABLE_ALL_PACKAGES:BOOL=OFF \ + -DSeacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \ + -DSeacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=OFF \ + -DSeacas_ENABLE_SEACASIoss:BOOL=ON \ + -DSeacas_ENABLE_SEACASExodus:BOOL=ON \ + -DSeacas_ENABLE_SEACASExodus_for:BOOL=ON \ + -DSeacas_ENABLE_SEACASExoIIv2for32:BOOL=ON" if [ "${APPLICATIONS}" == "YES" ] then SUBSET_OPTIONS="${SUBSET_OPTIONS} \ - -DSEACASProj_ENABLE_SEACASAprepro:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASAprepro_lib:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASConjoin:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEjoin:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEpu:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExo2mat:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExo_format:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExodiff:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASMat2exo:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASNemslice:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASNemspread:BOOL=ON" + -DSeacas_ENABLE_SEACASAprepro:BOOL=ON \ + -DSeacas_ENABLE_SEACASAprepro_lib:BOOL=ON \ + -DSeacas_ENABLE_SEACASConjoin:BOOL=ON \ + -DSeacas_ENABLE_SEACASEjoin:BOOL=ON \ + -DSeacas_ENABLE_SEACASEpu:BOOL=ON \ + -DSeacas_ENABLE_SEACASExo2mat:BOOL=ON \ + -DSeacas_ENABLE_SEACASExo_format:BOOL=ON \ + -DSeacas_ENABLE_SEACASExodiff:BOOL=ON \ + -DSeacas_ENABLE_SEACASMat2exo:BOOL=ON \ + -DSeacas_ENABLE_SEACASNemslice:BOOL=ON \ + -DSeacas_ENABLE_SEACASNemspread:BOOL=ON" if [ "${FORTRAN}" == "YES" ] then SUBSET_OPTIONS="${SUBSET_OPTIONS} \ - -DSEACASProj_ENABLE_SEACASExplore:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGrepos:BOOL=ON" + -DSeacas_ENABLE_SEACASExplore:BOOL=ON \ + -DSeacas_ENABLE_SEACASGrepos:BOOL=ON" fi elif [ "${LEGACY}" == "YES" ] && [ "${FORTRAN}" == "YES" ] then SUBSET_OPTIONS="${SUBSET_OPTIONS} \ - -DSEACASProj_ENABLE_SEACASAlgebra:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASBlot:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEx1ex2v2:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASEx2ex1v2:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExomatlab:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExotec2:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASExotxt:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASFastq:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGen3D:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGenshell:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASGjoin:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASMapvar:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASMapvar-kd:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASNemesis:BOOL=ON \ - -DSEACASProj_ENABLE_SEACASTxtexo:BOOL=ON" + -DSeacas_ENABLE_SEACASAlgebra:BOOL=ON \ + -DSeacas_ENABLE_SEACASBlot:BOOL=ON \ + -DSeacas_ENABLE_SEACASEx1ex2v2:BOOL=ON \ + -DSeacas_ENABLE_SEACASEx2ex1v2:BOOL=ON \ + -DSeacas_ENABLE_SEACASExomatlab:BOOL=ON \ + -DSeacas_ENABLE_SEACASExotec2:BOOL=ON \ + -DSeacas_ENABLE_SEACASExotxt:BOOL=ON \ + -DSeacas_ENABLE_SEACASFastq:BOOL=ON \ + -DSeacas_ENABLE_SEACASGen3D:BOOL=ON \ + -DSeacas_ENABLE_SEACASGenshell:BOOL=ON \ + -DSeacas_ENABLE_SEACASGjoin:BOOL=ON \ + -DSeacas_ENABLE_SEACASMapvar:BOOL=ON \ + -DSeacas_ENABLE_SEACASMapvar-kd:BOOL=ON \ + -DSeacas_ENABLE_SEACASNemesis:BOOL=ON \ + -DSeacas_ENABLE_SEACASTxtexo:BOOL=ON" fi fi @@ -183,7 +183,7 @@ HAVE_X11=${X11:-YES} ### Set to YES to enable the building of a thread-safe version of the Exodus and IOSS libraries. THREADSAFE=${THREADSAFE:-NO} if [ "$THREADSAFE" == "YES" ] ; then - THREAD_SAFE_OPT="-DSEACASProj_EXTRA_LINK_FLAGS=-lpthread" + THREAD_SAFE_OPT="-DSeacas_EXTRA_LINK_FLAGS=-lpthread" fi if [ "${FAODEL_INSTALL}" == "" ]; then @@ -342,13 +342,13 @@ cmake -G "${GENERATOR}" \ -D BUILD_SHARED_LIBS:BOOL=${SHARED} \ -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \ ${SUBSET_OPTIONS} \ --D SEACASProj_ENABLE_Zoltan:BOOL=${ZOLTAN} \ --D SEACASProj_ENABLE_TESTS=ON \ +-D Seacas_ENABLE_Zoltan:BOOL=${ZOLTAN} \ +-D Seacas_ENABLE_TESTS=ON \ -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \ --D SEACASProj_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ --D SEACASProj_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ --D SEACASProj_ENABLE_DOXYGEN:BOOL=${DOXYGEN} \ --D SEACASProj_ENABLE_Fortran=${FORTRAN} \ +-D Seacas_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ +-D Seacas_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ +-D Seacas_ENABLE_DOXYGEN:BOOL=${DOXYGEN} \ +-D Seacas_ENABLE_Fortran=${FORTRAN} \ \ -D TPL_ENABLE_Netcdf:BOOL=${HAVE_NETCDF} \ -D TPL_ENABLE_Matio:BOOL=${HAVE_MATIO} \ diff --git a/cmake-sems b/cmake-sems index f991e1cc58..18314ff08e 100755 --- a/cmake-sems +++ b/cmake-sems @@ -104,19 +104,19 @@ then then export "OMPI_CXX=${SEACAS_SRC_DIR}/packages/kokkos/config/nvcc_wrapper" export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1 - KOKKOS_SYMBOLS="-D SEACASProj_ENABLE_Kokkos:BOOL=ON \ + KOKKOS_SYMBOLS="-D Seacas_ENABLE_Kokkos:BOOL=ON \ -D TPL_ENABLE_CUDA:Bool=ON \ -D CUDA_TOOLKIT_ROOT_DIR:PATH=${CUDA_PATH} \ -D Kokkos_ENABLE_Pthread:BOOL=OFF" else export OMPI_CXX=`which gcc` unset CUDA_MANAGED_FORCE_DEVICE_ALLOC - KOKKOS_SYMBOLS="-D SEACASProj_ENABLE_Kokkos:BOOL=ON \ - -D SEACASProj_ENABLE_OpenMP:Bool=ON \ + KOKKOS_SYMBOLS="-D Seacas_ENABLE_Kokkos:BOOL=ON \ + -D Seacas_ENABLE_OpenMP:Bool=ON \ -D Kokkos_ENABLE_Pthread:BOOL=OFF" fi else - KOKKOS_SYMBOLS="-D SEACASProj_ENABLE_Kokkos:BOOL=OFF" + KOKKOS_SYMBOLS="-D Seacas_ENABLE_Kokkos:BOOL=OFF" fi rm -f CMakeCache.txt @@ -132,17 +132,17 @@ cmake \ -D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE \ -D BUILD_SHARED_LIBS:BOOL=OFF \ -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \ --D SEACASProj_ENABLE_ALL_PACKAGES:BOOL=ON \ --D SEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ --D SEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON \ --D SEACASProj_ENABLE_TESTS=ON \ +-D Seacas_ENABLE_ALL_PACKAGES:BOOL=ON \ +-D Seacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ +-D Seacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON \ +-D Seacas_ENABLE_TESTS=ON \ -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \ -D CMAKE_CXX_COMPILER:FILEPATH=${CXX} \ -D TPL_ENABLE_fmt:BOOL=ON \ -D CMAKE_C_COMPILER:FILEPATH=${CC} \ -D CMAKE_Fortran_COMPILER:FILEPATH=${FC} \ --D SEACASProj_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ --D SEACASProj_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ +-D Seacas_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ +-D Seacas_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ \ -D TPL_ENABLE_Netcdf:BOOL=${HAVE_NETCDF} \ -D TPL_ENABLE_Matio:BOOL=${HAVE_MATIO} \ diff --git a/cmake-travis.sh b/cmake-travis.sh index a9b94f9847..b66b3521a6 100755 --- a/cmake-travis.sh +++ b/cmake-travis.sh @@ -78,19 +78,19 @@ then then export "OMPI_CXX=${SEACAS_SRC_DIR}/packages/kokkos/config/nvcc_wrapper" export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1 - KOKKOS_SYMBOLS="-D SEACASProj_ENABLE_Kokkos:BOOL=ON \ + KOKKOS_SYMBOLS="-D Seacas_ENABLE_Kokkos:BOOL=ON \ -D TPL_ENABLE_CUDA:Bool=ON \ -D CUDA_TOOLKIT_ROOT_DIR:PATH=${CUDA_PATH} \ -D Kokkos_ENABLE_Pthread:BOOL=OFF" else export OMPI_CXX=$(which gcc) unset CUDA_MANAGED_FORCE_DEVICE_ALLOC - KOKKOS_SYMBOLS="-D SEACASProj_ENABLE_Kokkos:BOOL=ON \ - -D SEACASProj_ENABLE_OpenMP:Bool=ON \ + KOKKOS_SYMBOLS="-D Seacas_ENABLE_Kokkos:BOOL=ON \ + -D Seacas_ENABLE_OpenMP:Bool=ON \ -D Kokkos_ENABLE_Pthread:BOOL=OFF" fi else - KOKKOS_SYMBOLS="-D SEACASProj_ENABLE_Kokkos:BOOL=OFF" + KOKKOS_SYMBOLS="-D Seacas_ENABLE_Kokkos:BOOL=OFF" fi if [ "HAVE_FAODEL" == "ON" ] @@ -113,13 +113,13 @@ cmake \ -D CMAKE_INSTALL_RPATH:PATH=${INSTALL_PATH}/lib \ -D BUILD_SHARED_LIBS:BOOL=OFF \ -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \ --D SEACASProj_ENABLE_ALL_PACKAGES:BOOL=ON \ --D SEACASProj_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ --D SEACASProj_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON \ --D SEACASProj_ENABLE_TESTS=ON \ +-D Seacas_ENABLE_ALL_PACKAGES:BOOL=ON \ +-D Seacas_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \ +-D Seacas_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON \ +-D Seacas_ENABLE_TESTS=ON \ -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \ --D SEACASProj_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ --D SEACASProj_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ +-D Seacas_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=ON \ +-D Seacas_HIDE_DEPRECATED_CODE:BOOL=${OMIT_DEPRECATED_CODE} \ \ -D TPL_ENABLE_Netcdf:BOOL=${HAVE_NETCDF} \ -D TPL_ENABLE_Matio:BOOL=${HAVE_MATIO} \ diff --git a/cmake/ProjectCompilerPostConfig.cmake b/cmake/ProjectCompilerPostConfig.cmake index 68bbdcdebe..9214228584 100644 --- a/cmake/ProjectCompilerPostConfig.cmake +++ b/cmake/ProjectCompilerPostConfig.cmake @@ -1,4 +1,4 @@ -IF (${SEACASProj_ENABLE_Kokkos}) +IF (${Seacas_ENABLE_Kokkos}) PRINT_VAR(KOKKOS_ARCH) diff --git a/debian/rules b/debian/rules index ea0baf3828..bcb8d8cb1f 100755 --- a/debian/rules +++ b/debian/rules @@ -14,9 +14,9 @@ override_dh_auto_configure: -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ -DHDF5_ROOT:PATH=/usr/ \ - -DSEACASProj_ENABLE_ALL_PACKAGES:BOOL=ON \ - -DSEACASProj_ENABLE_TESTS:BOOL=OFF \ - -DSEACASProj_USE_GNUINSTALLDIRS:BOOL=ON \ + -DSeacas_ENABLE_ALL_PACKAGES:BOOL=ON \ + -DSeacas_ENABLE_TESTS:BOOL=OFF \ + -DSeacas_USE_GNUINSTALLDIRS:BOOL=ON \ -DTPL_ENABLE_CGNS:BOOL=OFF \ -DTPL_ENABLE_Matio:BOOL=ON \ -DTPL_ENABLE_METIS:BOOL=ON \ diff --git a/packages/seacas/CMakeLists.txt b/packages/seacas/CMakeLists.txt index 0d5886c5aa..8351f3db62 100644 --- a/packages/seacas/CMakeLists.txt +++ b/packages/seacas/CMakeLists.txt @@ -34,7 +34,7 @@ set(SEACASExodus_ENABLE_SHARED_DEFAULT "OFF") # On windows (and probably other systems), we only want a single # exodus library and not both static and shared. if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") + if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") if (BUILD_SHARED_LIBS) set(SEACASExodus_ENABLE_STATIC_DEFAULT "ON") else() diff --git a/packages/seacas/README.md b/packages/seacas/README.md index 26522197e2..5e814ee7ca 100644 --- a/packages/seacas/README.md +++ b/packages/seacas/README.md @@ -134,7 +134,7 @@ parallel capability enabled (if applicable). You can then continue with the steps outlined in the previous section. ## Testing -There are a few unit tests for zoltan, exodus, ioss, and aprepro that can be run via `make test` or `ctest` if you configured with `-D SEACASProj_ENABLE_TESTS=YES`. +There are a few unit tests for zoltan, exodus, ioss, and aprepro that can be run via `make test` or `ctest` if you configured with `-D Seacas_ENABLE_TESTS=YES`. There is also a system-level test that just verifies that the applications can read and write exodus files correctly. This test runs off of the installed applications. To run do: diff --git a/packages/seacas/applications/explore/CMakeLists.txt b/packages/seacas/applications/explore/CMakeLists.txt index d83a0e1934..65521c108e 100644 --- a/packages/seacas/applications/explore/CMakeLists.txt +++ b/packages/seacas/applications/explore/CMakeLists.txt @@ -1,6 +1,6 @@ INCLUDE(FortranSettings) -if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") +if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") INCLUDE(InstallSymLink) endif() @@ -25,7 +25,7 @@ TRIBITS_ADD_EXECUTABLE( ) if (explore_added) - if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") + if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") InstallSymLink(explore ${CMAKE_INSTALL_PREFIX}/bin/grope) endif() endif() diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt index 795e979d77..fdb403e33b 100644 --- a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt +++ b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt @@ -90,9 +90,9 @@ if(USE_TRIBITS) SOURCES ${SOURCES} ) -if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") +if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") # add a target to generate API documentation with Doxygen - if(SEACASProj_ENABLE_DOXYGEN) + if(Seacas_ENABLE_DOXYGEN) find_package(Doxygen) if(DOXYGEN_FOUND) add_custom_command(TARGET aprepro_lib POST_BUILD diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt index 300e93da18..9e91f1f14f 100644 --- a/packages/seacas/libraries/exodus/CMakeLists.txt +++ b/packages/seacas/libraries/exodus/CMakeLists.txt @@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES( FILE(GLOB SOURCES src/ex_*.c) -if (${SEACAS_HIDE_DEPRECATED_CODE} OR ${SEACASProj_HIDE_DEPRECATED_CODE}) +if (${SEACAS_HIDE_DEPRECATED_CODE} OR ${Seacas_HIDE_DEPRECATED_CODE}) else() FILE(GLOB DEP_SOURCES src/deprecated/ex_*.c) endif() @@ -66,9 +66,9 @@ if (SEACASExodus_ENABLE_STATIC) InstallSymLink(libexodus.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2c.a) endif() -if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") +if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") # add a target to generate API documentation with Doxygen - if(SEACASProj_ENABLE_DOXYGEN) + if(Seacas_ENABLE_DOXYGEN) find_package(Doxygen) if(DOXYGEN_FOUND) add_custom_command(TARGET exodus POST_BUILD diff --git a/packages/seacas/libraries/ioss/cmake/Dependencies.cmake b/packages/seacas/libraries/ioss/cmake/Dependencies.cmake index 7f6fb0face..b0c993bab2 100644 --- a/packages/seacas/libraries/ioss/cmake/Dependencies.cmake +++ b/packages/seacas/libraries/ioss/cmake/Dependencies.cmake @@ -1,4 +1,4 @@ -if(CMAKE_PROJECT_NAME STREQUAL "SEACASProj") +if(CMAKE_PROJECT_NAME STREQUAL "Seacas") TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_OPTIONAL_PACKAGES SEACASExodus Zoltan LIB_OPTIONAL_TPLS HDF5 Pamgen CGNS ParMETIS Faodel Cereal DLlib Pthread ADIOS2 Catalyst2 GTest Kokkos DataWarp fmt diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.txt b/packages/seacas/libraries/ioss/src/CMakeLists.txt index 96df21c474..8ff4844b31 100644 --- a/packages/seacas/libraries/ioss/src/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/CMakeLists.txt @@ -76,9 +76,9 @@ IF (MINGW) target_link_libraries(Ioss psapi) ENDIF () -if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") +if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") # add a target to generate API documentation with Doxygen - if(SEACASProj_ENABLE_DOXYGEN) + if(Seacas_ENABLE_DOXYGEN) find_package(Doxygen) if(DOXYGEN_FOUND) add_custom_command(TARGET Ioss diff --git a/packages/seacas/scripts/CMakeLists.txt b/packages/seacas/scripts/CMakeLists.txt index 414b010bcc..a52758cc5a 100644 --- a/packages/seacas/scripts/CMakeLists.txt +++ b/packages/seacas/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ -if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") +if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") INCLUDE(InstallSymLink) endif() @@ -147,7 +147,7 @@ IF (${PROJECT_NAME}_ENABLE_SEACASExodus) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge2.py DESTINATION lib) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge3.py DESTINATION lib) - if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") + if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") InstallSymLink(${EXODUSPY} ${CMAKE_INSTALL_PREFIX}/lib/exodus.py) InstallSymLink(${EXOMERGE} ${CMAKE_INSTALL_PREFIX}/lib/exomerge.py) endif()