diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-24 22:45:38 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-24 22:45:38 +0100 |
| commit | 323dd162f5326b998e1c92ab4cfec8a63574023f (patch) | |
| tree | fb4f0f4f7585d3cb90aef453167c7f4df0c6eeee /cmake/opentrack-qt.cmake | |
| parent | 3981f867377ca0652d0cc0ababbbc30208db7e1c (diff) | |
cmake: decruft, disable deprecated Qt functions
Diffstat (limited to 'cmake/opentrack-qt.cmake')
| -rw-r--r-- | cmake/opentrack-qt.cmake | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index e90e3250..0e6ca73d 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -59,8 +59,14 @@ function(otr_qt n) list(APPEND ${n}-all ${${n}-${i}}) endforeach() set(${n}-all "${${n}-all}" PARENT_SCOPE) - include_directories(SYSTEM ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) - add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}) - add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) - add_definitions(-DQT_DEPRECATED -DQT_DISABLE_DEPRECATED_BEFORE=-1) +endfunction() + +function(otr_qt2 n) + target_include_directories("${n}" PRIVATE SYSTEM + ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} + ) + target_compile_definitions("${n}" PRIVATE + ${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} + -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT + ) endfunction() |