From 15375537ebafd5b4ff2a1dad6d496ae5f1e1fd5b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 13 Jan 2018 09:23:26 +0100 Subject: cmake: variant work --- cmake/opentrack-i18n.cmake | 9 ++++++++- cmake/opentrack-variant.cmake | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'cmake') diff --git a/cmake/opentrack-i18n.cmake b/cmake/opentrack-i18n.cmake index 74d5dcee..7005187c 100644 --- a/cmake/opentrack-i18n.cmake +++ b/cmake/opentrack-i18n.cmake @@ -1,4 +1,11 @@ function(otr_i18n_for_target_directory n) + get_property(variant GLOBAL PROPERTY opentrack-variant) + if(NOT ".${variant}" STREQUAL "default") + set(force-skip-update TRUE) + else() + set(force-skip-update FALSE) + endif() + set(k "opentrack-${n}") get_property(lupdate-binary TARGET "${Qt5_LUPDATE_EXECUTABLE}" PROPERTY IMPORTED_LOCATION) @@ -6,7 +13,7 @@ function(otr_i18n_for_target_directory n) foreach(i ${opentrack_all-translations}) set(t "${CMAKE_CURRENT_SOURCE_DIR}/lang/${i}.ts") set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY CLEAN_NO_CUSTOM 1) - if(NOT opentrack_disable-i18n-update) + if(maybe-skip-update OR NOT opentrack_disable-i18n-update) add_custom_command(OUTPUT "${t}" COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_SOURCE_DIR}/lang" COMMAND "${lupdate-binary}" -silent -recursive -no-obsolete -locations relative . -ts "${t}" diff --git a/cmake/opentrack-variant.cmake b/cmake/opentrack-variant.cmake index 7418f882..607aa441 100644 --- a/cmake/opentrack-variant.cmake +++ b/cmake/opentrack-variant.cmake @@ -1,8 +1,8 @@ -# set these as cache variables manually - set(opentrack_variant "default" CACHE STRING "") set_property(CACHE opentrack_variant PROPERTY STRINGS "default;trackmouse") +# XXX that belongs in each variant's directory! + function(otr_dist_select_variant) if(opentrack_variant STREQUAL "trackmouse") set_property(GLOBAL PROPERTY opentrack-variant "trackmouse") @@ -17,6 +17,7 @@ function(otr_dist_select_variant) "logic" "dinput" "gui" + "pose-widget" "spline" "cv" "migration") -- cgit v1.2.3