adding cibuildwheel repair command for windows

stephen-dixon · Aug 5, 2024 · a65b176 · a65b176
1 parent 1071768
commit a65b176
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -96,8 +96,6 @@ jobs:
           -DNO_IDL_WRAPPER=ON
           -DNO_MEMCACHE=ON
           -DCMAKE_INSTALL_PREFIX=install
-          && cp C:/vcpkg/installed/x64-windows-static-md/include/iconv.h C:/vcpkg/installed/x64-windows-static-md/include/libxml2/libxml/
-          && cp C:/vcpkg/installed/x64-windows-static-md/include/iconv.h ./source/structures/
           && cmake --build build -j --config Release 
           && cmake --install build --config Release
           && ls install/lib
@@ -114,6 +112,10 @@ jobs:
           # && Add-Content -Path ./build/CMakeCache.txt -Value "Iconv_INCLUDE_DIR:PATH=C:/vcpkg/installed/x64-windows-static-md/include"
 
 
+
+          # && cp C:/vcpkg/installed/x64-windows-static-md/include/iconv.h C:/vcpkg/installed/x64-windows-static-md/include/libxml2/libxml/
+          # && cp C:/vcpkg/installed/x64-windows-static-md/include/iconv.h ./source/structures/
+
       # - name: test pyuda on windows
       #   if: runner.os == 'Windows'
       #   env:
@@ -141,6 +143,7 @@ jobs:
           CIBW_ARCHS: ${{matrix.build-platform[1]}}
           CIBW_PLATFORM: windows
           CIBW_BUILD: cp*-${{matrix.build-platform[2]}}
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel} --add-path ${{github.workspace}}/install/lib"
 
 
       - name: Build manylinux2014 wheels

diff --git a/source/structures/CMakeLists.txt b/source/structures/CMakeLists.txt
@@ -11,6 +11,10 @@ else()
 endif()
 
 find_package( LibXml2 REQUIRED )
+if ( WIN32 )
+    find_package( Iconv REQUIRED )
+    message( "ICONV INCLUDE DIR: ${Iconv_INCLUDE_DIR}" )
+endif()
 
 ########################################################################################################################
 # Sources
@@ -28,7 +32,7 @@ include_directories(
 )
 
 if( MINGW OR WIN32 )
-  include_directories( ${XDR_INCLUDE_DIR} )
+  include_directories( ${XDR_INCLUDE_DIR} ${Iconv_INCLUDE_DIR} )
 #  add_compile_options( -Wno-error=use-after-free )
 elseif( TIRPC_FOUND )
   include_directories( ${TIRPC_INCLUDE_DIR} )