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

backend/tests/CMakeLists.txt: cmake min 3.18 -> 3.9, bwipp_dump.ps tar (#235)

Browse Source
This commit is contained in:
gitlost 2021-07-08 12:08:59 +01:00
parent 3046690d98
commit d7d787383e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,9 +7,6 @@ project(zint-package)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
#set(CMAKE_VERBOSE_MAKEFILE ON)
#comment or remove the above line before release
set(ZINT_VERSION_MAJOR 2) set(ZINT_VERSION_MAJOR 2)
set(ZINT_VERSION_MINOR 9) set(ZINT_VERSION_MINOR 9)
set(ZINT_VERSION_RELEASE 1) set(ZINT_VERSION_RELEASE 1)
@ -126,6 +123,7 @@ elseif($ENV{CMAKE_PREFIX_PATH} MATCHES "6[.][0-9][.][0-9]")
find_package(Qt6Xml) find_package(Qt6Xml)
if(Qt6Widgets_FOUND AND Qt6Gui_FOUND AND Qt6UiTools_FOUND AND Qt6Xml_FOUND) if(Qt6Widgets_FOUND AND Qt6Gui_FOUND AND Qt6UiTools_FOUND AND Qt6Xml_FOUND)
message(STATUS "Qt version: " ${Qt6Core_VERSION_MAJOR}.${Qt6Core_VERSION_MINOR}.${Qt6Core_VERSION_PATCH})
add_subdirectory(backend_qt) add_subdirectory(backend_qt)
add_subdirectory(frontend_qt) add_subdirectory(frontend_qt)
else() else()

8
backend/tests/CMakeLists.txt
View File

@ -3,7 +3,7 @@
# 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 :
cmake_minimum_required(VERSION 3.18) cmake_minimum_required(VERSION 3.9)
project(zint_backend_tests) project(zint_backend_tests)
enable_testing() enable_testing()
@ -11,10 +11,12 @@ enable_testing()
include(${zint-package_SOURCE_DIR}/cmake/zint_add_test.cmake) include(${zint-package_SOURCE_DIR}/cmake/zint_add_test.cmake)
set(BWIPP_TAR ${CMAKE_CURRENT_SOURCE_DIR}/tools/bwipp_dump.ps.tar.xz) set(BWIPP_TAR ${CMAKE_CURRENT_SOURCE_DIR}/tools/bwipp_dump.ps.tar.xz)
set(BWIPP_PS ${CMAKE_BINARY_SOURCE_DIR}/tools/bwipp_dump.ps) set(BWIPP_PS ${CMAKE_CURRENT_BINARY_DIR}/tools/bwipp_dump.ps)
if(NOT EXISTS ${BWIPP_PS}) if(NOT EXISTS ${BWIPP_PS})
file(ARCHIVE_EXTRACT INPUT ${BWIPP_TAR} DESTINATION tools) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tools)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf ${BWIPP_TAR}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tools)
endif() endif()
set(testcommon_SRCS testcommon.c testcommon.h) set(testcommon_SRCS testcommon.c testcommon.h)