diff options
| author | Kai Pastor <dg0yt@darc.de> | 2024-02-29 08:15:06 +0100 |
|---|---|---|
| committer | Kai Pastor <dg0yt@darc.de> | 2024-02-29 08:15:06 +0100 |
| commit | ea3f6cc28f56f0e785756bf7e272dbe51de2ff5d (patch) | |
| tree | 0939f1336b1794a9fe6d3a8600f75b3f57018133 | |
| parent | 1b72e85dc9a2b55c9142a74fb5b93338d59f92f0 (diff) | |
Fix export of OPJ_STATIC macro
| -rw-r--r-- | src/lib/openjp2/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/lib/openjpip/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index 99cf580a..915a2298 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt @@ -83,12 +83,12 @@ endif() # Build the library if(WIN32) + add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) if(BUILD_SHARED_LIBS) - add_definitions(-DOPJ_EXPORTS) + target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PRIVATE OPJ_EXPORTS) else() - add_definitions(-DOPJ_STATIC) + target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC) endif() - add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) else() if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt index e9d81930..6584a744 100644 --- a/src/lib/openjpip/CMakeLists.txt +++ b/src/lib/openjpip/CMakeLists.txt @@ -52,14 +52,14 @@ set(LOCAL_SRCS ) # Build the library +add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) if(WIN32) if(BUILD_SHARED_LIBS) - add_definitions(-DOPJ_EXPORTS) + target_compile_definitions(openjpip PRIVATE OPJ_EXPORTS) else() - add_definitions(-DOPJ_STATIC) + target_compile_definitions(openjpip PUBLIC OPJ_STATIC) endif() endif() -add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) set_target_properties(openjpip PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) |