Skip to content

CMake: define digidocpp_EXPORTS for static builds #723

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

Open
lnagel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CMake: define digidocpp_EXPORTS for static builds #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de1656b
CMake: add digidocpp_STATIC define for static library builds
lnagel Mar 16, 2026
e53d5c4
Use generator expression for digidocpp_EXPORTS/digidocpp_STATIC
lnagel Mar 24, 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
9 changes: 4 additions & 5 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ add_library(digidocpp_tsl STATIC
)

set_target_properties(digidocpp_util digidocpp_tsl PROPERTIES
COMPILE_DEFINITIONS digidocpp_EXPORTS
POSITION_INDEPENDENT_CODE YES
)
target_compile_definitions(digidocpp_tsl PUBLIC $<IF:$<BOOL:${BUILD_SHARED_LIBS}>,digidocpp_EXPORTS,digidocpp_STATIC>)
target_compile_definitions(digidocpp_util PUBLIC $<IF:$<BOOL:${BUILD_SHARED_LIBS}>,digidocpp_EXPORTS,digidocpp_STATIC>)

target_include_directories(digidocpp_tsl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)

Expand Down Expand Up @@ -255,8 +256,9 @@ if(SWIG_FOUND)
endif()
endif()

if(NOT ${BUILD_SHARED_LIBS})
if(NOT BUILD_SHARED_LIBS)
set(STATIC_TARGETS minizip digidocpp_tsl digidocpp_util)
target_compile_definitions(digidocpp PUBLIC digidocpp_STATIC)
Comment thread
lnagel marked this conversation as resolved.
endif()

install(TARGETS digidocpp ${STATIC_TARGETS}
Expand Down Expand Up @@ -390,9 +392,6 @@ if( FRAMEWORK )
COMMAND zip -r ${PROJECT_BINARY_DIR}/libdigidocpp-dbg_${VERSION}$ENV{VER_SUFFIX}.zip libdigidocpp.dSYM
)
else()
if(NOT ${BUILD_SHARED_LIBS})
install( TARGETS minizip digidocpp_tsl digidocpp_util DESTINATION ${CMAKE_INSTALL_LIBDIR} )
endif()
if( BUILD_TOOLS )
install( TARGETS digidoc-tool DESTINATION ${CMAKE_INSTALL_BINDIR} )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/digidoc-tool.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
Expand Down
4 changes: 3 additions & 1 deletion src/Exports.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

#ifdef WIN32
#include <winapifamily.h>
#ifdef digidocpp_EXPORTS
#ifdef digidocpp_STATIC
#define DIGIDOCPP_EXPORT
#elifdef digidocpp_EXPORTS
#define DIGIDOCPP_EXPORT __declspec(dllexport)
#else
#define DIGIDOCPP_EXPORT __declspec(dllimport)
Expand Down
Loading