From 47d4b25bd0583b1fd65ae885950efd34c9df256b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 28 Mar 2019 13:40:33 +0100 Subject: cmake: move around variant directories --- cmake/opentrack-variant.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'cmake') 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() -- cgit v1.2.3