diff --git a/README.md b/README.md index eb8ce84..c06f4c0 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ make install ### Version -2.5.0 +2.5.1 diff --git a/VERSION b/VERSION index 437459c..73462a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.0 +2.5.1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1b88909..390ed1f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,7 +27,9 @@ set_target_properties(${lib_name} PROPERTIES Fortran_MODULE_DIRECTORY target_include_directories(${lib_name} INTERFACE $ $) -target_link_libraries(${lib_name} PRIVATE MPI::MPI_Fortran bacio::bacio_4 w3nco::w3nco_d) + +#depends on w3nco and bacio, but users must link their own version +target_link_libraries(${lib_name} PRIVATE MPI::MPI_Fortran) list(APPEND LIB_TARGETS ${lib_name}) install(DIRECTORY ${module_dir} DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7eb1dcb..9657e56 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,3 @@ - set(tstName read_nemsio) set(srcName read_nemsio.f90) set(exeName read_nemsio.x) @@ -9,10 +8,10 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink add_executable(${exeName} ${srcName}) add_dependencies(${exeName} nemsio) -target_link_libraries( ${exeName} PUBLIC nemsio) +target_link_libraries( ${exeName} PUBLIC nemsio bacio::bacio_4 w3nco::w3nco_d) add_test(NAME ${tstName} COMMAND ${exeName} testdataset) add_pfunit_ctest (nemsio_test TEST_SOURCES test_mod.pf - LINK_LIBRARIES nemsio + LINK_LIBRARIES nemsio bacio::bacio_4 w3nco::w3nco_d ) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 465bb93..220eac2 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,14 +1,14 @@ add_executable(nemsio_read nemsio_read.f90) -target_link_libraries(nemsio_read nemsio) +target_link_libraries(nemsio_read nemsio bacio::bacio_4 w3nco::w3nco_d) add_executable(nemsio_get nemsio_get.f90) -target_link_libraries(nemsio_get nemsio) +target_link_libraries(nemsio_get nemsio bacio::bacio_4 w3nco::w3nco_d) add_executable(nemsio_chgdate nemsio_chgdate.f90) -target_link_libraries(nemsio_chgdate nemsio) +target_link_libraries(nemsio_chgdate nemsio bacio::bacio_4 w3nco::w3nco_d) add_executable(mkgfsnemsioctl mkgfsnemsioctl.f90) -target_link_libraries(mkgfsnemsioctl nemsio) +target_link_libraries(mkgfsnemsioctl nemsio bacio::bacio_4 w3nco::w3nco_d) install(TARGETS nemsio_read nemsio_get nemsio_chgdate mkgfsnemsioctl RUNTIME DESTINATION bin COMPONENT utilities)