Skip to content

Commit 441be40

Browse files
author
Arthur Glowacki
committed
Changed hdf5 search back to before. Will look to compile on alcf another way since this breaks building on windows
1 parent 86dc79c commit 441be40

1 file changed

Lines changed: 3 additions & 24 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,6 @@ ELSE()
373373
)
374374
ENDIF()
375375

376-
set(HDF5_LIB_LEN 0)
377-
list(LENGTH HDF5_LIBRARIES HDF5_LIB_LEN)
378376

379377
#--------------- start pyxrf-maps lib -----------------
380378
IF (BUILD_WITH_PYBIND11)
@@ -385,24 +383,12 @@ IF (BUILD_WITH_PYBIND11)
385383
pybind11_add_module(pyxrfmaps src/pybindings/main.cpp)
386384
IF (BUILD_WITH_ZMQ)
387385
IF (WIN32)
388-
IF(${HDF5_LIB_LEN} LESS 1)
389-
target_link_libraries(pyxrfmaps PRIVATE libxrf_fit libxrf_io netCDF::netcdf libzmq-static ws2_32.lib rpcrt4.lib iphlpapi.lib)
390-
ELSE()
391386
target_link_libraries(pyxrfmaps PRIVATE libxrf_fit libxrf_io netCDF::netcdf hdf5::hdf5-shared libzmq-static ws2_32.lib rpcrt4.lib iphlpapi.lib)
392-
ENDIF()
393387
ELSEIF (UNIX)
394-
IF(${HDF5_LIB_LEN} LESS 1)
395-
target_link_libraries(pyxrfmaps PRIVATE libxrf_fit libxrf_io netCDF::netcdf libzmq-static)
396-
ELSE()
397388
target_link_libraries(pyxrfmaps PRIVATE libxrf_fit libxrf_io netCDF::netcdf hdf5::hdf5-shared libzmq-static)
398-
ENDIF()
399389
ENDIF()
400390
ELSE()
401-
IF(${HDF5_LIB_LEN} LESS 1)
402-
target_link_libraries(pyxrfmaps PRIVATE libxrf_fit libxrf_io netCDF::netcdf)
403-
ELSE()
404391
target_link_libraries(pyxrfmaps PRIVATE libxrf_fit libxrf_io netCDF::netcdf hdf5::hdf5-shared)
405-
ENDIF()
406392
ENDIF()
407393
ENDIF()
408394

@@ -527,16 +513,9 @@ ELSEIF (UNIX)
527513
ENDIF()
528514
ENDIF()
529515

530-
# Building on theta doesn't need hdf5 and it is empty os need a check
531-
IF(${HDF5_LIB_LEN} LESS 1)
532-
target_link_libraries (libxrf_fit PRIVATE NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
533-
target_link_libraries(libxrf_io PRIVATE libxrf_fit netCDF::netcdf yaml-cpp::yaml-cpp JsonCpp::JsonCpp NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
534-
target_link_libraries (xrf_maps PRIVATE libxrf_io libxrf_fit netCDF::netcdf yaml-cpp::yaml-cpp JsonCpp::JsonCpp NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
535-
ELSE()
536-
target_link_libraries(libxrf_fit PRIVATE NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
537-
target_link_libraries(libxrf_io PRIVATE libxrf_fit netCDF::netcdf hdf5::hdf5-shared yaml-cpp::yaml-cpp JsonCpp::JsonCpp NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
538-
target_link_libraries (xrf_maps PRIVATE libxrf_io libxrf_fit netCDF::netcdf hdf5::hdf5-shared yaml-cpp::yaml-cpp JsonCpp::JsonCpp NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
539-
ENDIF()
516+
target_link_libraries(libxrf_fit PRIVATE NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
517+
target_link_libraries(libxrf_io PRIVATE libxrf_fit netCDF::netcdf hdf5::hdf5-shared yaml-cpp::yaml-cpp JsonCpp::JsonCpp NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
518+
target_link_libraries (xrf_maps PRIVATE libxrf_io libxrf_fit netCDF::netcdf hdf5::hdf5-shared yaml-cpp::yaml-cpp JsonCpp::JsonCpp NLopt::nlopt ${CMAKE_THREAD_LIBS_INIT} )
540519

541520
IF (BUILD_WITH_QT)
542521
target_link_libraries (libxrf_io LINK_PUBLIC ${Qt6Charts_LIBRARIES} )

0 commit comments

Comments
 (0)