cmake: move around variant directories

32 files changed, 5 insertions, 5 deletions

diff --git a/cmake/opentrack-variant.cmake b/cmake/opentrack-variant.cmake
index 3ea01eaa..2cf39fcd 100644
--- a/cmake/opentrack-variant.cmake
+++ b/cmake/opentrack-variant.cmake
@@ -7,17 +7,17 @@ function(otr_dist_select_variant)
 
     foreach(k ${variants})
         get_filename_component(name "${k}" NAME)
-        if(EXISTS "${k}/_variant.cmake" AND EXISTS "${k}/CMakeLists.txt")
+        if(EXISTS "${k}/_variant.cmake")
             list(APPEND variant-list "${name}")
         else()
-            message(FATAL_ERROR "Stray item in variant dir '${name}'")
+            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" OR NOT EXISTS "${dir}/CMakeLists.txt")
+    if(NOT EXISTS "${dir}/_variant.cmake")
         set(opentrack_variant "default" CACHE STRING "" FORCE)
         set(dir "${CMAKE_SOURCE_DIR}/variant/${opentrack_variant}")
     endif()
@@ -26,6 +26,4 @@ function(otr_dist_select_variant)
 
     include("${dir}/_variant.cmake")
     otr_init_variant()
-
-    add_subdirectory("${dir}")
 endfunction()
diff --git a/variant/default/CMakeLists.txt b/opentrack/CMakeLists.txt
index a8829aa5..a8829aa5 100644
--- a/variant/default/CMakeLists.txt
+++ b/opentrack/CMakeLists.txt
diff --git a/variant/default/lang/nl_NL.ts b/opentrack/lang/nl_NL.ts
index 7a465820..7a465820 100644
--- a/variant/default/lang/nl_NL.ts
+++ b/opentrack/lang/nl_NL.ts
diff --git a/variant/default/lang/ru_RU.ts b/opentrack/lang/ru_RU.ts
index 684a8212..684a8212 100644
--- a/variant/default/lang/ru_RU.ts
+++ b/opentrack/lang/ru_RU.ts
diff --git a/variant/default/lang/stub.ts b/opentrack/lang/stub.ts
index 04555dd0..04555dd0 100644
--- a/variant/default/lang/stub.ts
+++ b/opentrack/lang/stub.ts
diff --git a/variant/default/lang/zh_CN.ts b/opentrack/lang/zh_CN.ts
index 15609d70..15609d70 100644
--- a/variant/default/lang/zh_CN.ts
+++ b/opentrack/lang/zh_CN.ts
diff --git a/variant/default/main-window.cpp b/opentrack/main-window.cpp
index b90aa3bd..b90aa3bd 100644
--- a/variant/default/main-window.cpp
+++ b/opentrack/main-window.cpp
diff --git a/variant/default/main-window.hpp b/opentrack/main-window.hpp
index 9ffb7019..9ffb7019 100644
--- a/variant/default/main-window.hpp
+++ b/opentrack/main-window.hpp
diff --git a/variant/default/main-window.ui b/opentrack/main-window.ui
index 7aab90e8..7aab90e8 100644
--- a/variant/default/main-window.ui
+++ b/opentrack/main-window.ui
diff --git a/variant/default/main.cpp b/opentrack/main.cpp
index 2c1dc607..2c1dc607 100644
--- a/variant/default/main.cpp
+++ b/opentrack/main.cpp
diff --git a/variant/default/new_config.ui b/opentrack/new_config.ui
index a262e725..a262e725 100644
--- a/variant/default/new_config.ui
+++ b/opentrack/new_config.ui
diff --git a/variant/default/new_file_dialog.cpp b/opentrack/new_file_dialog.cpp
index 70816c5d..70816c5d 100644
--- a/variant/default/new_file_dialog.cpp
+++ b/opentrack/new_file_dialog.cpp
diff --git a/variant/default/new_file_dialog.h b/opentrack/new_file_dialog.h
index 7244e524..7244e524 100644
--- a/variant/default/new_file_dialog.h
+++ b/opentrack/new_file_dialog.h
diff --git a/variant/default/opentrack.ico b/opentrack/opentrack.ico
index 5cac8da1..5cac8da1 100644
--- a/variant/default/opentrack.ico
+++ b/opentrack/opentrack.ico
diff --git a/variant/default/resources.rc b/opentrack/resources.rc
index 6fd0253b..6fd0253b 100644
--- a/variant/default/resources.rc
+++ b/opentrack/resources.rc
diff --git a/variant/trackmouse/CMakeLists.txt b/trackmouse/CMakeLists.txt
index 6240d4b3..6240d4b3 100644
--- a/variant/trackmouse/CMakeLists.txt
+++ b/trackmouse/CMakeLists.txt
diff --git a/variant/trackmouse/images/start.png b/trackmouse/images/start.png
index b8e6f271..b8e6f271 100644
--- a/variant/trackmouse/images/start.png
+++ b/trackmouse/images/start.png
diff --git a/variant/trackmouse/images/stop.png b/trackmouse/images/stop.png
index 0ff13bd5..0ff13bd5 100644
--- a/variant/trackmouse/images/stop.png
+++ b/trackmouse/images/stop.png
diff --git a/variant/trackmouse/lang/nl_NL.ts b/trackmouse/lang/nl_NL.ts
index 92f790af..92f790af 100644
--- a/variant/trackmouse/lang/nl_NL.ts
+++ b/trackmouse/lang/nl_NL.ts
diff --git a/variant/trackmouse/lang/ru_RU.ts b/trackmouse/lang/ru_RU.ts
index dd9011c4..dd9011c4 100644
--- a/variant/trackmouse/lang/ru_RU.ts
+++ b/trackmouse/lang/ru_RU.ts
diff --git a/variant/trackmouse/lang/stub.ts b/trackmouse/lang/stub.ts
index 968e31c5..968e31c5 100644
--- a/variant/trackmouse/lang/stub.ts
+++ b/trackmouse/lang/stub.ts
diff --git a/variant/trackmouse/lang/zh_CN.ts b/trackmouse/lang/zh_CN.ts
index 968e31c5..968e31c5 100644
--- a/variant/trackmouse/lang/zh_CN.ts
+++ b/trackmouse/lang/zh_CN.ts
diff --git a/variant/trackmouse/main.cpp b/trackmouse/main.cpp
index 2313e1ac..2313e1ac 100644
--- a/variant/trackmouse/main.cpp
+++ b/trackmouse/main.cpp
diff --git a/variant/trackmouse/trackmouse-res.qrc b/trackmouse/trackmouse-res.qrc
index f351b3f2..f351b3f2 100644
--- a/variant/trackmouse/trackmouse-res.qrc
+++ b/trackmouse/trackmouse-res.qrc
diff --git a/variant/trackmouse/trackmouse-settings.cpp b/trackmouse/trackmouse-settings.cpp
index 45ec36a5..45ec36a5 100644
--- a/variant/trackmouse/trackmouse-settings.cpp
+++ b/trackmouse/trackmouse-settings.cpp
diff --git a/variant/trackmouse/trackmouse.ico b/trackmouse/trackmouse.ico
index 5cac8da1..5cac8da1 100644
--- a/variant/trackmouse/trackmouse.ico
+++ b/trackmouse/trackmouse.ico
diff --git a/variant/trackmouse/trackmouse.rc b/trackmouse/trackmouse.rc
index 8df1e9b1..8df1e9b1 100644
--- a/variant/trackmouse/trackmouse.rc
+++ b/trackmouse/trackmouse.rc
diff --git a/variant/trackmouse/window.cpp b/trackmouse/window.cpp
index d6c8a8dd..d6c8a8dd 100644
--- a/variant/trackmouse/window.cpp
+++ b/trackmouse/window.cpp
diff --git a/variant/trackmouse/window.hpp b/trackmouse/window.hpp
index 2c196852..2c196852 100644
--- a/variant/trackmouse/window.hpp
+++ b/trackmouse/window.hpp
diff --git a/variant/trackmouse/window.ui b/trackmouse/window.ui
index c79ae846..c79ae846 100644
--- a/variant/trackmouse/window.ui
+++ b/trackmouse/window.ui
diff --git a/variant/default/_variant.cmake b/variant/default/_variant.cmake
index 7501b0a4..7353b0f4 100644
--- a/variant/default/_variant.cmake
+++ b/variant/default/_variant.cmake
@@ -25,6 +25,7 @@ function(otr_init_variant)
         "main-window"
         "video"
         "video-*"
+        "opentrack"
     )
 
     set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}")
diff --git a/variant/trackmouse/_variant.cmake b/variant/trackmouse/_variant.cmake
index 404c28ec..1a65f6df 100644
--- a/variant/trackmouse/_variant.cmake
+++ b/variant/trackmouse/_variant.cmake
@@ -16,6 +16,7 @@ function(otr_init_variant)
         "migration"
         "executable"
         "pose-widget"
+        "trackmouse"
     )
     set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}")
 endfunction()