From 28f193fff2b96bef5a7f36f60718475da82c4e9e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 23 Jan 2023 13:59:51 +0100 Subject: cmake: oops, fix qt library copy logic --- cmake/opentrack-qt.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cmake/opentrack-qt.cmake') diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index 41bd6291..800e9096 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -4,7 +4,7 @@ if(WIN32) endif() set(qt-required-components Core Network Widgets LinguistTools Gui) set(qt-optional-components SerialPort) -set(qt-imported-targets Qt5::Core Qt5::Gui Qt5::Network Qt5::SerialPort Qt5::Widgets) +set(qt-imported-targets Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets) if(APPLE) list(APPEND qt-required-components "DBus") list(APPEND qt-optional-components "Multimedia") @@ -31,7 +31,9 @@ function(otr_install_qt_libs) endif() endfunction() -otr_install_qt_libs() +if(WIN32 OR APPLE) + otr_install_qt_libs() +endif() function(otr_qt n) if(".${${n}-cc}${${n}-cxx}${${n}-hh}" STREQUAL ".") -- cgit v1.2.3 From 5ae2ca85c41757dd72bd8651cfddfada517b30e3 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 1 Mar 2023 23:41:49 +0100 Subject: cmake: fix -isystem in include_directories() --- cmake/opentrack-qt.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/opentrack-qt.cmake') diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index 800e9096..1735e836 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -51,7 +51,7 @@ function(otr_qt n) endfunction() function(otr_qt2 n) - target_include_directories("${n}" PRIVATE SYSTEM + target_include_directories("${n}" SYSTEM PRIVATE ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ) target_compile_definitions("${n}" PRIVATE -- cgit v1.2.3