Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Code.v05-00/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ target_link_libraries(${PROJECT_NAME} PRIVATE netCDF::netcdf netCDF::netcdf-cxx4
find_package(yaml-cpp CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE yaml-cpp::yaml-cpp)

find_package(OpenSSL REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)

# Other dependencies:

find_package(OpenMP REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE OpenMP::OpenMP_CXX)

find_package(OpenSSL REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::Crypto OpenSSL::SSL crypto ssl)

# This ensures the header files of the necessary libraries are included
# SYSTEM flag silences the compiler warnings from external dependencies
include_directories(SYSTEM ${Boost_INCLUDES})
Expand Down
2 changes: 1 addition & 1 deletion Code.v05-00/submodules/vcpkg
Submodule vcpkg updated 8577 files
2 changes: 1 addition & 1 deletion Code.v05-00/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target_link_libraries(unittest Catch2::Catch2WithMain Util AIM EPM YamlInputRea
catch_discover_tests(unittest)

add_executable(test_solver test_adv_diff_solver.cpp)
target_link_libraries(test_solver Catch2::Catch2WithMain FVM_ANDS Core LAGRID crypto ssl)
target_link_libraries(test_solver Catch2::Catch2WithMain FVM_ANDS Core LAGRID OpenSSL::SSL OpenSSL::Crypto)
catch_discover_tests(test_solver)

add_executable(test_LAGRID test_LAGRID.cpp)
Expand Down
1 change: 1 addition & 0 deletions Code.v05-00/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"fmt",
"fftw3",
"netcdf-cxx4",
"openssl",
"yaml-cpp"
]
}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ These are all managed using the `vcpkg` tool (see below) so do not need to be in
- Catch2
- FFTW3
- OpenMP
- OpenSSL
- Boost libraries
- yaml-cpp
- Eigen3
Expand Down