Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for serial build #305

Merged
merged 1 commit into from
May 17, 2022
Merged

Updates for serial build #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions TPL/matio/runcmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ rm -f config.cache

cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \
-DBUILD_SHARED_LIBS:BOOL=${SHARED} \
-DMATIO_SHARED:BOOL=${SHARED} \
-DMATIO_DEFAULT_FILE_VERSION=7.3 \
-DMATIO_MAT73:BOOL=ON \
-DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} \
Expand Down
2 changes: 1 addition & 1 deletion install-tpl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ then
if [ "$DOWNLOAD" == "YES" ]
then
echo "${txtgrn}+++ Downloading...${txtrst}"
rm -rf gtest
rm -rf googletest
git clone https://github.com/google/googletest.git
fi

Expand Down
2 changes: 2 additions & 0 deletions packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
#include <Ioss_StandardElementTypes.h>

#include <gtest/gtest.h>
#ifdef SEACAS_HAVE_MPI
#include <mpi.h>
#endif
#include <string>
#include <unordered_map>

Expand Down
2 changes: 2 additions & 0 deletions packages/seacas/libraries/ioss/src/unit_tests/UnitTestTextMesh.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
#include <string>
#include <vector>

#ifdef SEACAS_HAVE_MPI
#include "mpi.h"
#endif
#include "gtest/gtest.h"

#include "UnitTestIotmTextMeshFixture.h"
Expand Down
6 changes: 6 additions & 0 deletions packages/seacas/libraries/ioss/src/unit_tests/unitMain.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,22 @@
// See packages/seacas/LICENSE for details

#include <gtest/gtest.h>
#ifdef SEACAS_HAVE_MPI
#include <mpi.h>
#endif

int main(int argc, char **argv)
{
#ifdef SEACAS_HAVE_MPI
MPI_Init(&argc, &argv);
#endif

testing::InitGoogleTest(&argc, argv);
int errorCode = RUN_ALL_TESTS();

#ifdef SEACAS_HAVE_MPI
MPI_Finalize();
#endif

return errorCode;
}