mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

#220 backend/tests cmake: Use PNG::PNG for libpng (cf #213), props Schaich Alonso

Browse Source
This commit is contained in:
gitlost 2021-03-08 12:34:34 +00:00
parent 6b7b5109b9
commit d81b5db271
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/tests/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2019 - 2020 Robin Stuart <rstuart114@gmail.com>
# Copyright (C) 2019 - 2021 Robin Stuart <rstuart114@gmail.com>
# Adapted from qrencode/tests/CMakeLists.txt
# Copyright (C) 2006-2017 Kentaro Fukuchi <kentaro@fukuchi.org>
# vim: set ts=4 sw=4 et :
@ -17,9 +17,7 @@ set(ZINT_TEST FALSE CACHE BOOL "Set test compile flag")
find_package(LibZint REQUIRED)
find_package(PNG)
if(PNG_FOUND)
include_directories(${PNG_INCLUDES})
else()
if(NOT PNG_FOUND)
add_definitions(-DNO_PNG)
endif()
@ -65,7 +63,7 @@ endif()
add_library(testcommon testcommon.c testcommon.h)
if(PNG_FOUND)
target_link_libraries(testcommon ZINT::ZINT ${PNG_LIBRARIES})
target_link_libraries(testcommon ZINT::ZINT PNG::PNG)
else()
target_link_libraries(testcommon ZINT::ZINT)
endif()
@ -113,7 +111,9 @@ zint_add_test(medical, test_medical)
zint_add_test(pcx, test_pcx)
zint_add_test(pdf417, test_pdf417)
zint_add_test(plessey, test_plessey)
if(PNG_FOUND)
zint_add_test(png, test_png)
endif()
zint_add_test(postal, test_postal)
zint_add_test(print, test_print)
zint_add_test(ps, test_ps)

5
backend/tests/test_print.c
View File

@ -1,6 +1,6 @@
/*
libzint - the open source barcode library
Copyright (C) 2020 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2020 - 2021 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -90,6 +90,9 @@ static void test_print(int index, int generate, int debug) {
}
for (int j = 0; j < exts_len; j++) {
#ifdef NO_PNG
if (strcmp(exts[j], "png") == 0) continue;
#endif
strcpy(data_dir, "../data/print/");
strcat(data_dir, exts[j]);

1
backend/tests/testcommon.c
View File

@ -40,6 +40,7 @@
#include <zlib.h>
#include <setjmp.h>
#endif
#include <limits.h>
#include <unistd.h>
#include <errno.h>