Revert commits from 36745

[features.git] / development / cmake / modules / LyXMacros.cmake

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index d85b6aa9f4a241b4d8e59330c65cf38cceb5b0dd..928a9d05a103ab2ef05cadfd09dc837eb5720bd8 100644 (file)
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -113,6 +113,7 @@ macro(LYX_AUTOMOC)
                        ARGS ${_def} ${_moc_INCS} ${_header} -o ${_moc}
                        MAIN_DEPENDENCY ${_header})
                macro_add_file_dependencies(${_abs_FILE} ${_moc})
+               SET_SOURCE_FILES_PROPERTIES(${_moc} GENERATED)
             endforeach (_current_MOC_INC)
          else()
             #message(STATUS "moc not found : ${_abs_FILE} ")
@@ -227,9 +228,22 @@ macro(lyx_qt_resources_file _qrc_name _to_dir _list)
 endmacro(lyx_qt_resources_file)
 
 
-macro(LYX_OPTION _name _description _default)
-       option(LYX_${_name} ${_description} ${_default})
-       set(_msg ON)
+macro(LYX_OPTION _name _description _default _sys)
+       set(_msg OFF)
+       if(${_sys} MATCHES "GCC")
+               set(_system CMAKE_COMPILER_IS_GNUCXX)
+       else()
+               set(_system ${_sys})
+       endif()
+       if(${_system} MATCHES "ALL")
+               option(LYX_${_name} ${_description} ${_default})
+               set(_msg ON)
+       else()
+               if(${${_system}})
+                       option(LYX_${_name} ${_description} ${_default})
+                       set(_msg ON)
+               endif()
+       endif()
        if(_msg)
                string(SUBSTRING "LYX_${_name}                            " 0 25 _var)
                string(SUBSTRING "${LYX_${_name}}     " 0 4 _val)