From d7d787383e22ad69c08e93306f0909e8e541de1b Mon Sep 17 00:00:00 2001 From: gitlost Date: Thu, 8 Jul 2021 12:08:59 +0100 Subject: [PATCH] backend/tests/CMakeLists.txt: cmake min 3.18 -> 3.9, bwipp_dump.ps tar (#235) --- CMakeLists.txt | 4 +--- backend/tests/CMakeLists.txt | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a480e4a9..ef3465be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,6 @@ project(zint-package) 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_MINOR 9) set(ZINT_VERSION_RELEASE 1) @@ -126,6 +123,7 @@ elseif($ENV{CMAKE_PREFIX_PATH} MATCHES "6[.][0-9][.][0-9]") find_package(Qt6Xml) 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(frontend_qt) else() diff --git a/backend/tests/CMakeLists.txt b/backend/tests/CMakeLists.txt index 7e88a013..9fc91d25 100644 --- a/backend/tests/CMakeLists.txt +++ b/backend/tests/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2006-2017 Kentaro Fukuchi # vim: set ts=4 sw=4 et : -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.9) project(zint_backend_tests) enable_testing() @@ -11,10 +11,12 @@ enable_testing() 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_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}) - 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() set(testcommon_SRCS testcommon.c testcommon.h)