From 2107d68e7137ed52a13fb8cdc70306213aff6db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Fri, 10 Feb 2023 13:34:50 +0100 Subject: [PATCH] Add missing PUBLIC keyword and change LIBXISF_STATIC_LIB define --- CMakeLists.txt | 3 ++- libXISF_global.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42a2969..92f2216 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,8 @@ target_link_libraries(XISF PUBLIC Qt${QT_VERSION_MAJOR}::Core) if(BUILD_SHARED_LIBS) target_compile_definitions(XISF PRIVATE LIBXISF_LIBRARY) - target_compile_definitions(XISF LIBXISF_SHARED_LIB) +else(BUILD_SHARED_LIBS) + target_compile_definitions(XISF PUBLIC LIBXISF_STATIC_LIB) endif(BUILD_SHARED_LIBS) set(XISF_PUBLIC_HEADERS libxisf.h libXISF_global.h) diff --git a/libXISF_global.h b/libXISF_global.h index 3b211b5..fd298de 100644 --- a/libXISF_global.h +++ b/libXISF_global.h @@ -21,14 +21,14 @@ #include -#ifdef LIBXISF_SHARED_LIB +#ifdef LIBXISF_STATIC_LIB +# define LIBXISF_EXPORT +#else # if defined(LIBXISF_LIBRARY) # define LIBXISF_EXPORT Q_DECL_EXPORT # else # define LIBXISF_EXPORT Q_DECL_IMPORT # endif -#else -# define LIBXISF_EXPORT #endif #endif // LIBXISF_GLOBAL_H