From: Kornel Benko <kornel@lyx.org>
Date: Sat, 7 Jun 2014 19:00:46 +0000 (+0200)
Subject: Cmake build: Add combo-values to the list of displayed lyx options
X-Git-Tag: 2.2.0alpha1~1850
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a0ae2e7392cd80b633bdaf70ef6824725c38c22;p=features.git

Cmake build: Add combo-values to the list of displayed lyx options
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f1047951a..9fdc28955f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -840,7 +840,7 @@ if(LYX_ENABLE_URLTESTS)
 endif()
 
 message(STATUS)
-message(STATUS "Build options, switch LYX_* variables by -DLYX_*=ON or OFF:")
+message(STATUS "Build params, switch LYX_* options by -DLYX_*=ON or OFF, LYX_* combos by -DLYX_*=value:")
 message(STATUS)
 
 LYX_OPTION_LIST_ALL(used)
diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index 2bddaaf079..4332830c25 100644
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -237,6 +237,8 @@ macro(LYX_COMBO _name _description _default)
   set(LYX_${_name} ${_default} CACHE STRING "${_description}")
   set_property(CACHE LYX_${_name} PROPERTY STRINGS ${_default} ${ARGN})
   list(APPEND LYX_OPTIONS LYX_${_name})
+  set(LYX_${_name}_show_message ON)
+  set(LYX_${_name}_description ${_description})
 endmacro()
 
 macro(LYX_OPTION_LIST_ALL)
@@ -255,7 +257,10 @@ macro(LYX_OPTION_LIST_ALL)
 	foreach(_option ${LYX_OPTIONS})
 		if(${_option}_show_message OR ${ARGV0} STREQUAL "help")
 			string(SUBSTRING "${_option}                            " 0 25 _var)
-			if(${_option})
+                        get_property(_prop CACHE ${_option} PROPERTY STRINGS)
+                        if(_prop)
+                          set(_isset ${${_option}})
+			elseif(${_option})
 				set(_isset ON)
 			else()
 				set(_isset OFF)