From 1b56a179a16cdb5d0504897e53c65eb351aa67f2 Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 8 Jan 2024 20:35:15 +0100 Subject: [PATCH] use static fftw, usb and z libs Signed-off-by: Martin --- CHANGELOG | 1 + openhantek/CMakeLists.txt | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1829b2de..465ef65e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +2024-01-01 (e6d863d): next build system update 2024-01-01 (7f9eb94): build system update 2023-12-31 (3b12af2): prepare next release 3.4 2023-12-31 (98959ab): prepare next release 3.4 diff --git a/openhantek/CMakeLists.txt b/openhantek/CMakeLists.txt index 67630b26..f55fadc7 100644 --- a/openhantek/CMakeLists.txt +++ b/openhantek/CMakeLists.txt @@ -2,6 +2,12 @@ project(OpenHantek CXX) +if(WIN32) + set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") + set(CMAKE_EXE_LINKER_FLAGS "-s") + set(EXECTYPE WIN32) +endif() + find_package(Qt5Widgets REQUIRED) find_package(Qt5PrintSupport REQUIRED) find_package(Qt5OpenGL REQUIRED) @@ -12,6 +18,8 @@ set(CMAKE_AUTORCC ON) if (Qt5Widgets_VERSION VERSION_LESS 5.4.0) message(FATAL_ERROR "Minimum supported Qt5 version is 5.4.0!") +else() + message("-- Qt5 version is ${Qt5Widgets_VERSION}") endif() # include directories @@ -34,11 +42,6 @@ add_custom_target(format SOURCES ".clang-format" # here the translation magic happens include(translations/Translations.cmake) -set(EXECTYPE "") -if(WIN32 AND MINGW) - set(EXECTYPE WIN32) -endif() - option(USE_OPENHANTEK_DRIVER "Use OpenHantek Windows driver" ON) # Enable MacOSX bundle magic in the next line