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

Make pFUnit optional #20

Merged
merged 2 commits into from
Dec 21, 2023
Merged

Make pFUnit optional #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a76d65
Make pfunit optional
zurdala Dec 21, 2023
6213545
Activate pfunit in build.sh
zurdala Dec 21, 2023
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
14 changes: 9 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,18 @@ add_test(NAME test_io_nxtbuf COMMAND test_io_nxtbuf )
add_test(NAME test_io_parse_from_fid COMMAND test_io_parse_from_fid )
add_test(NAME test_io_sprint COMMAND test_io_sprint )

#Create test scenarios
find_package(PFUNIT REQUIRED)
#enable_testing()

if (PFUNIT_FOUND)
add_subdirectory(pFUnittests)
if (ENABLE_PFUNIT)
#Create test scenarios
find_package(PFUNIT REQUIRED)
#enable_testing()

if (PFUNIT_FOUND)
add_subdirectory(pFUnittests)
endif()
endif()


# Generate API documentation with Doxygen
find_package(Doxygen)
if(DOXYGEN_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fi
cd build
echo "Executing cmake"

cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_Fortran_COMPILER=$Fortran_COMPILER -DENABLE_OpenMP_SUPPORT=ON -DENABLE_POSTGRESQL_SUPPORT=ON ../
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_Fortran_COMPILER=$Fortran_COMPILER -DENABLE_OpenMP_SUPPORT=ON -DENABLE_POSTGRESQL_SUPPORT=ON -DENABLE_PFUNIT=ON ../
echo "Running make install"
make install
if [[ $? -ne 0 ]]; then
Expand Down
Loading