diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-11 14:36:07 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-11 14:36:07 +0100 |
| commit | e1d6232217120be879bb639681f61e46e2d48580 (patch) | |
| tree | d186ffc3dd72de6e4703d584a41971107ca8389b /cmake | |
| parent | 98ef185a5c9075720acb54ec1c2e5fec6e4ab440 (diff) | |
cmake, gui, main: make user interface reusable
The work isn't complete. We need moving out all non-reusable parts away
and only keeping user interface logic in a class.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 2 | ||||
| -rw-r--r-- | cmake/opentrack-qt.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index a8da8a23..a4d197be 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -38,7 +38,7 @@ function(otr_glob_sources var) file(GLOB ${var}-ui ${dir}/*.ui) file(GLOB ${var}-rc ${dir}/*.qrc) set(${var}-all ${${var}-cc} ${${var}-cxx} ${${var}-hh} ${${var}-rc} ${${var}-res}) - foreach(i ui rc res cc hh all) + foreach(i ui rc res cc cxx hh all) set(${var}-${i} "${${var}-${i}}" PARENT_SCOPE) endforeach() endfunction() diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index 3939a981..665ed053 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -48,9 +48,9 @@ endfunction() otr_install_qt_libs() function(otr_qt n) - if(".${${n}-hh}" STREQUAL ".") + if(".${${n}-cc}${${n}-cxx}${${n}-hh}" STREQUAL ".") message(FATAL_ERROR "project ${n} not globbed") - endif() + endif() qt5_wrap_cpp(${n}-moc ${${n}-hh} OPTIONS --no-notes) qt5_wrap_ui(${n}-uih ${${n}-ui}) qt5_add_resources(${n}-rcc ${${n}-rc}) |