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

2nd attempt to fix [857021] - add ZINT_NO_PNG define to tests

Browse Source
This commit is contained in:
gitlost 2024-07-18 01:38:29 +01:00
parent b3a8680a90
commit 9c701f1009
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/zint_add_test.cmake
View File

@ -1,4 +1,4 @@
# Copyright (C) 2021-23 Robin Stuart <rstuart114@gmail.com> # Copyright (C) 2021-2024 Robin Stuart <rstuart114@gmail.com>
# Adapted from qrencode/tests/CMakeLists.txt # Adapted from qrencode/tests/CMakeLists.txt
# Copyright (C) 2006-2017 Kentaro Fukuchi <kentaro@fukuchi.org> # Copyright (C) 2006-2017 Kentaro Fukuchi <kentaro@fukuchi.org>
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
@ -8,6 +8,9 @@ macro(zint_add_test test_name test_command)
if(ZINT_SHARED) if(ZINT_SHARED)
add_executable(${test_command} ${test_command}.c) add_executable(${test_command} ${test_command}.c)
target_link_libraries(${test_command} testcommon ${ADDITIONAL_LIBS}) target_link_libraries(${test_command} testcommon ${ADDITIONAL_LIBS})
if(NOT (ZINT_USE_PNG AND PNG_FOUND))
target_compile_definitions(${test_command} PRIVATE ZINT_NO_PNG)
endif()
add_test(${test_name} ${test_command}) add_test(${test_name} ${test_command})
if(MSVC) if(MSVC)
set_tests_properties(${test_name} PROPERTIES ENVIRONMENT set_tests_properties(${test_name} PROPERTIES ENVIRONMENT
@ -20,6 +23,9 @@ macro(zint_add_test test_name test_command)
if(ZINT_STATIC) if(ZINT_STATIC)
add_executable(${test_command}-static ${test_command}.c) add_executable(${test_command}-static ${test_command}.c)
target_link_libraries(${test_command}-static testcommon-static ${ADDITIONAL_LIBS}) target_link_libraries(${test_command}-static testcommon-static ${ADDITIONAL_LIBS})
if(NOT (ZINT_USE_PNG AND PNG_FOUND))
target_compile_definitions(${test_command}-static PRIVATE ZINT_NO_PNG)
endif()
add_test(${test_name}-static ${test_command}-static) add_test(${test_name}-static ${test_command}-static)
if(MSVC) if(MSVC)
set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT