Skip to content

Fix Windows wheel build #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lnagel merged 4 commits into from
Feb 16, 2026
Merged

Fix Windows wheel build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b319bec
Re-enable Windows wheel build for PR testing
lnagel Feb 16, 2026
0f8d944
Fix Windows build: override install() to suppress upstream PDB rules
lnagel Feb 16, 2026
07c55ae
Remove redundant upstream install() override for Windows builds
lnagel Feb 16, 2026
88e4e09
Fix Windows static build: override install() and fix dllimport
lnagel Feb 16, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-15] # Windows disabled pending investigation
os: [ubuntu-latest, macos-15, windows-latest]

steps:
- uses: actions/checkout@v6
Expand Down
24 changes: 19 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,26 @@ if(APPLE AND NOT DEFINED LibXml2_ROOT)
endif()
endif()

# Disable upstream install() rules entirely — they fail on Windows with static
# builds due to $<TARGET_PDB_FILE:...> on targets that are static or don't exist.
# We define our own install rules below.
set(CMAKE_SKIP_INSTALL_RULES ON)
# Suppress all upstream install() rules — they fail on Windows with static builds
# due to $<TARGET_PDB_FILE:...> on targets that are static or don't exist.
# Override install() as a no-op during add_subdirectory, then restore it.
set(_pydigidoc_SKIP_INSTALL TRUE)
macro(install)
if(NOT _pydigidoc_SKIP_INSTALL)
_install(${ARGV})
endif()
endmacro()
add_subdirectory(libdigidocpp EXCLUDE_FROM_ALL)
set(CMAKE_SKIP_INSTALL_RULES OFF)
set(_pydigidoc_SKIP_INSTALL FALSE)

# On Windows with static builds, upstream Exports.h defaults to __declspec(dllimport)
# because digidocpp_EXPORTS is only defined for shared library builds. Fix by defining
# it on the static library target so DIGIDOCPP_EXPORT becomes __declspec(dllexport),
# which is correct for compiling (not importing) the library.
if(WIN32 AND NOT BUILD_SHARED_LIBS)
target_compile_definitions(digidocpp PUBLIC digidocpp_EXPORTS)
target_compile_definitions(digidocpp_util PUBLIC digidocpp_EXPORTS)
endif()

unset(ANDROID)
set(CMAKE_DISABLE_FIND_PACKAGE_SWIG FALSE)
Expand Down
Loading