diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2024-02-29 21:21:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 21:21:11 +0100 |
| commit | 3252f096f07575ed1e50a11021ee794b79ad99c7 (patch) | |
| tree | 7f3afea7bc7446fa3bfa376e0cf5af61a6130826 /src/lib | |
| parent | 06566e937ba23c8451ddda31592f7d4da33c54ae (diff) | |
| parent | 51d1cd40f716d7a0d1b77e0a77796eb86b17136a (diff) | |
Fix export of OPJ_STATIC, cleanup
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/lib/openjpip/CMakeLists.txt | 6 |
2 files changed, 13 insertions, 19 deletions
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index 99cf580a..fd62335f 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt @@ -82,26 +82,20 @@ if(NOT WIN32 AND CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER MATCHES ".*mingw32 endif() # Build the library +add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) +set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) if(WIN32) if(BUILD_SHARED_LIBS) - add_definitions(-DOPJ_EXPORTS) + target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PRIVATE OPJ_EXPORTS) else() - add_definitions(-DOPJ_STATIC) - endif() - add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) - set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) -else() - if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) - # Builds both static and dynamic libs - add_library(${OPENJPEG_LIBRARY_NAME} SHARED ${OPENJPEG_SRCS}) - add_library(openjp2_static STATIC ${OPENJPEG_SRCS}) - set_target_properties(openjp2_static PROPERTIES OUTPUT_NAME ${OPENJPEG_LIBRARY_NAME}) - set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static) - target_include_directories(openjp2_static PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}>) - else() - add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) - set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) + target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC) endif() +elseif(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) + # Builds both static and dynamic libs + add_library(openjp2_static STATIC ${OPENJPEG_SRCS}) + set_target_properties(openjp2_static PROPERTIES OUTPUT_NAME ${OPENJPEG_LIBRARY_NAME}) + list(APPEND INSTALL_LIBS openjp2_static) + target_include_directories(openjp2_static PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}>) endif() target_include_directories(${OPENJPEG_LIBRARY_NAME} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}>) 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}) |