github-starred/libxlsxwriter
2
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter.git synced 2026-05-15 14:15:54 -06:00
Code Issues 16 Projects Packages Wiki Activity Actions

cmake: fix pkgconfig and cmake interaction

Browse source 
Issue #454
This commit is contained in:
John McNamara 2025-02-12 19:44:01 +00:00
parent 1beeb60d04
commit ea6da0dace
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -207,8 +207,10 @@ if(MSVC AND USE_STATIC_MSVC_RUNTIME)
endforeach() endforeach()
endif() endif()
# Configure pkg-config if(NOT MSVC)
find_package(PkgConfig) find_package(PkgConfig)
endif()
file(READ "include/xlsxwriter.h" ver) file(READ "include/xlsxwriter.h" ver)
string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver}) string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver})
@ -228,7 +230,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(ZLIB zlib) pkg_check_modules(ZLIB zlib)
list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}) list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
else(NOT ZLIB_FOUND) endif()
if(NOT ZLIB_FOUND)
find_package(ZLIB "1.0" REQUIRED) find_package(ZLIB "1.0" REQUIRED)
list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}) list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
message("zlib version: " ${ZLIB_VERSION}) message("zlib version: " ${ZLIB_VERSION})
@ -239,7 +242,8 @@ if(USE_SYSTEM_MINIZIP)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(MINIZIP minizip) pkg_check_modules(MINIZIP minizip)
list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}/..) list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}/..)
else(NOT MINIZIP_FOUND) endif()
if(NOT MINIZIP_FOUND)
find_package(MINIZIP "1.0" REQUIRED) find_package(MINIZIP "1.0" REQUIRED)
list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
endif() endif()
@ -288,7 +292,7 @@ if(USE_OPENSSL_MD5)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBCRYPTO libcrypto) pkg_check_modules(LIBCRYPTO libcrypto)
include_directories(${LIBCRYPTO_INCLUDE_DIRS}) include_directories(${LIBCRYPTO_INCLUDE_DIRS})
else(NOT LIBCRYPTO_FOUND) else()
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
message(STATUS "OpenSSL version: ${OPENSSL_VERSION}") message(STATUS "OpenSSL version: ${OPENSSL_VERSION}")