diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/opentrack-variant.cmake | 53 | ||||
| -rw-r--r-- | variant/default/_variant.cmake | 31 | ||||
| -rw-r--r-- | variant/trackmouse/_variant.cmake | 22 |
4 files changed, 29 insertions, 79 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e2ddd1d..18dd48cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ add_custom_target(mrproper WORKING_DIRECTORY "${CMAKE_BINARY_DIR}") function(otr_add_subdirs) - otr_dist_select_variant() + otr_init_variant() get_property(_globs GLOBAL PROPERTY opentrack-subprojects) otr_add_target_dirs(_globbed ${_globs}) diff --git a/cmake/opentrack-variant.cmake b/cmake/opentrack-variant.cmake index 9fb23f0a..5cb4bd57 100644 --- a/cmake/opentrack-variant.cmake +++ b/cmake/opentrack-variant.cmake @@ -1,29 +1,32 @@ include_guard(GLOBAL) -function(otr_dist_select_variant) - file(GLOB variants CONFIGURE_DEPENDS "variant/*") +function(otr_init_variant) + set_property(GLOBAL PROPERTY opentrack-variant "default") + set_property(GLOBAL PROPERTY opentrack-ident "opentrack-2.3") - set(variant-list "") - - foreach(k ${variants}) - get_filename_component(name "${k}" NAME) - if(EXISTS "${k}/_variant.cmake") - list(APPEND variant-list "${name}") - else() - message(FATAL_ERROR "stray variant dir '${name}'") - endif() - endforeach() - - set(opentrack_variant "default" CACHE STRING "") - set(dir "${CMAKE_SOURCE_DIR}/variant/${opentrack_variant}") - - if(NOT EXISTS "${dir}/_variant.cmake") - set(opentrack_variant "default" CACHE STRING "" FORCE) - set(dir "${CMAKE_SOURCE_DIR}/variant/${opentrack_variant}") - endif() - - set_property(CACHE opentrack_variant PROPERTY STRINGS "${variant-list}") - - include("${dir}/_variant.cmake") - otr_init_variant() + set(subprojects + "tracker-*" + "proto-*" + "filter-*" + "options" + "api" + "compat" + "logic" + "dinput" + "gui" + "main" + "x-plane-plugin" + "csv" + "pose-widget" + "spline" + "qxt-mini" + "macosx" + "cv" + "migration" + "main-window" + "video" + "video-*" + "opentrack" + ) + set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}") endfunction() diff --git a/variant/default/_variant.cmake b/variant/default/_variant.cmake index ffa795d0..e69de29b 100644 --- a/variant/default/_variant.cmake +++ b/variant/default/_variant.cmake @@ -1,31 +0,0 @@ -function(otr_init_variant) - set_property(GLOBAL PROPERTY opentrack-variant "default") - set_property(GLOBAL PROPERTY opentrack-ident "opentrack-2.3") - - set(subprojects - "tracker-*" - "proto-*" - "filter-*" - "options" - "api" - "compat" - "logic" - "dinput" - "gui" - "main" - "x-plane-plugin" - "csv" - "pose-widget" - "spline" - "qxt-mini" - "macosx" - "cv" - "migration" - "main-window" - "video" - "video-*" - "opentrack" - ) - - set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}") -endfunction() diff --git a/variant/trackmouse/_variant.cmake b/variant/trackmouse/_variant.cmake deleted file mode 100644 index 1a65f6df..00000000 --- a/variant/trackmouse/_variant.cmake +++ /dev/null @@ -1,22 +0,0 @@ -function(otr_init_variant) - set_property(GLOBAL PROPERTY opentrack-variant "trackmouse") - set_property(GLOBAL PROPERTY opentrack-ident "trackmouse-prototype") - set(subprojects - "tracker-pt" - "proto-mouse" - "filter-accela" - "options" - "api" - "compat" - "logic" - "dinput" - "gui" - "spline" - "cv" - "migration" - "executable" - "pose-widget" - "trackmouse" - ) - set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}") -endfunction() |