Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-09 21:15:57 +00:00
Code Issues Projects Releases Wiki Activity

CLI: --gs1XXX args now imply `--gs1

Browse Source 
GUI: fix chkGS1Strict enabling on startup regression from previous
  commit; update CLI equivalence with --gs1strict & adjust for
  implied --gs1; add tests
CMake: allow lpng/zlib and gs1encoders to take paths (for Windows)
win32/README: simplify locating lpng/zlib/gs1encoders for cmake
  using above; add note on 64-bit build
manual/man page: adjust for various above changes
This commit is contained in:
gitlost
2025-09-16 10:10:30 +01:00
parent e4e6143d87
commit 5138d0703c
12 changed files with 219 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/CMakeLists.txt
View File

@@ -6,10 +6,15 @@ cmake_minimum_required(VERSION 3.10)
project(zint)
if(ZINT_USE_PNG)
cmake_policy(SET CMP0074 NEW) # Allow use of `<PackageName>_ROOT` (Windows)
find_package(PNG)
endif()
if(ZINT_USE_GS1SE)
find_library(GS1SE gs1encoders)
if(WIN32)
find_library(GS1SE gs1encoders PATH ${GS1SE_PATH})
else()
find_library(GS1SE gs1encoders)
endif()
endif()
set(zint_COMMON_SRCS common.c eci.c filemem.c general_field.c gs1.c large.c library.c reedsol.c)
@@ -129,6 +134,10 @@ zint_target_include_directories(PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
if(WIN32 AND GS1SE)
get_filename_component(GS1SE_INC ${GS1SE} DIRECTORY)
zint_target_include_directories(PRIVATE ${GS1SE_INC})
endif()
# Adapted from old (2008) KDE "SetPaths.cmake" to use GNUInstallDirs
set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"