summaryrefslogtreecommitdiffhomepage
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/opentrack-boilerplate.cmake2
-rw-r--r--cmake/opentrack-qt.cmake4
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})