fixing windows link regression in hdf5

Author: Luispain

CMakeLists.txt

@@ -190,8 +190,12 @@ include_directories(
 file(GLOB_RECURSE CPP_FILES "src/c++/*.cpp")
 file(GLOB_RECURSE HPP_FILES "include/*.hpp")
 file(GLOB_RECURSE PYBIND_CPP_FILES "src/c++/*_pybind.cpp")
+set(CORE_PYTHON_ONLY_SRC
+    ${CMAKE_SOURCE_DIR}/src/c++/io/cgns/node_pycgns_converter.cpp
+)
 set(CORE_SHARED_SRC ${CPP_FILES} ${HPP_FILES})
 list(REMOVE_ITEM CORE_SHARED_SRC ${PYBIND_CPP_FILES})
+list(REMOVE_ITEM CORE_SHARED_SRC ${CORE_PYTHON_ONLY_SRC})
 
 if (MSVC)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -228,7 +232,6 @@ elseif(UNIX OR MSVC)
 endif()
 
 target_compile_definitions(core_shared PRIVATE BUILDING_NODE_LIBRARY)
-target_link_libraries(core_shared PUBLIC pybind11::module)
 
 
 if(ENABLE_HDF5_IO)
@@ -237,13 +240,21 @@ if(ENABLE_HDF5_IO)
     if(MSVC)
         # Copy HDF5 DLLs into the wheel output directory so they're bundled in the .whl
         set(HDF5_DLL "${HDF5_ROOT}/bin/hdf5.dll")
+        if(DEFINED HDF5_C_LIBRARY AND EXISTS "${HDF5_C_LIBRARY}")
+            set(HDF5_IMPLIB "${HDF5_C_LIBRARY}")
+        else()
+            set(HDF5_IMPLIB "${HDF5_ROOT}/lib/hdf5.lib")
+        endif()
         if(EXISTS "${HDF5_DLL}")
             message(STATUS "Copying HDF5 DLL: ${HDF5_DLL}")
             file(COPY "${HDF5_DLL}" DESTINATION ${VERSIONED_OUTPUT_DIR})
             set(HDF5_DLL_IN_OUTPUT "${VERSIONED_OUTPUT_DIR}/hdf5.dll")
         else()
             message(FATAL_ERROR "Required HDF5 DLL not found: ${HDF5_DLL}")
-        endif()        
+        endif()
+        if(NOT EXISTS "${HDF5_IMPLIB}")
+            message(FATAL_ERROR "Required HDF5 import library not found: ${HDF5_IMPLIB}")
+        endif()
     endif()
 
     if(UNIX AND NOT APPLE)
@@ -282,12 +293,17 @@ endif()
 
 pybind11_add_module(core MODULE
     src/c++/core_pybind.cpp
+    ${CORE_PYTHON_ONLY_SRC}
 )
 target_link_libraries(core PRIVATE core_shared)
 add_dependencies(core core_shared)
 if(APPLE)
     target_link_options(core PRIVATE "-Wl,-force_load,$<TARGET_FILE:core_shared>")
 endif()
+if(ENABLE_HDF5_IO)
+    target_include_directories(core PRIVATE ${HDF5_INCLUDE_DIRS})
+    target_link_libraries(core PRIVATE ${HDF5_LIBRARIES})
+endif()
 
 pybind11_add_module(_cgns MODULE src/c++/cgns_pybind.cpp)
 target_link_libraries(_cgns PRIVATE core_shared)
@@ -299,6 +315,7 @@ endif()
 install(TARGETS core_shared EXPORT noderTargets DESTINATION ${NODER_PACKAGE_DIR})
 if(MSVC AND ENABLE_HDF5_IO)
     install(FILES "${HDF5_DLL_IN_OUTPUT}" DESTINATION ${NODER_PACKAGE_DIR})
+    install(FILES "${HDF5_IMPLIB}" DESTINATION ${NODER_PACKAGE_DIR})
 endif()
 
 install(TARGETS core DESTINATION ${NODER_PACKAGE_DIR})

cmake/noderConfig.cmake.in

@@ -2,22 +2,22 @@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
-
-if(NOT pybind11_FOUND)
-    execute_process(
-        COMMAND "${Python3_EXECUTABLE}" -m pybind11 --cmakedir
-        OUTPUT_VARIABLE _noder_pybind11_cmakedir
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE _noder_pybind11_status
-    )
-    if(_noder_pybind11_status EQUAL 0 AND EXISTS "${_noder_pybind11_cmakedir}")
-        list(PREPEND CMAKE_PREFIX_PATH "${_noder_pybind11_cmakedir}")
+if("@ENABLE_HDF5_IO@" STREQUAL "ON" AND WIN32)
+    set(_noder_hdf5_dll "${PACKAGE_PREFIX_DIR}/noder/hdf5.dll")
+    set(_noder_hdf5_implib "${PACKAGE_PREFIX_DIR}/noder/hdf5.lib")
+    if(EXISTS "${_noder_hdf5_dll}" AND EXISTS "${_noder_hdf5_implib}")
+        if(NOT TARGET hdf5::hdf5-shared)
+            add_library(hdf5::hdf5-shared SHARED IMPORTED)
+            set_target_properties(hdf5::hdf5-shared PROPERTIES
+                IMPORTED_IMPLIB "${_noder_hdf5_implib}"
+                IMPORTED_LOCATION "${_noder_hdf5_dll}"
+            )
+        endif()
+    else()
+        find_dependency(HDF5 REQUIRED COMPONENTS C)
     endif()
 endif()
 
-find_dependency(pybind11 CONFIG REQUIRED)
-
 include("${CMAKE_CURRENT_LIST_DIR}/noderTargets.cmake")
 
 set_and_check(noder_PACKAGE_DIR "@PACKAGE_NODER_PACKAGE_DIR@")

include/io/cgns/node_pycgns_converter.hpp

@@ -15,13 +15,13 @@ namespace py = pybind11;
  * @param node Root node to convert.
  * @return Nested list representation.
  */
-NODE_EXPORT py::list nodeToPyCGNS(const std::shared_ptr<Node>& node);
+py::list nodeToPyCGNS(const std::shared_ptr<Node>& node);
 
 /**
  * @brief Convert a Python CGNS-like nested list to a Node hierarchy.
  * @param pyList Nested list representation.
  * @return Converted root node.
  */
-NODE_EXPORT std::shared_ptr<Node> pyCGNSToNode(const py::list& pyList);
+std::shared_ptr<Node> pyCGNSToNode(const py::list& pyList);
 
 # endif