Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index 74750212ea8fb033de009aa30c6bd77a8e025556..266a76f03c990036729d9a3ae038abbf33478398 100644 (file)
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -108,7 +108,7 @@ macro(LYX_AUTOMOC)
                                        #set(_moc ${_abs_PATH}/${_current_MOC})
                                        add_custom_command(OUTPUT ${_moc}
                                                          COMMAND ${QT_MOC_EXECUTABLE}
-                                                         ARGS ${_def} ${_moc_INCS} ${_header} -o ${_moc}
+                                                         ARGS "-DQT_VERSION=${QT4_VERSION}" ${_def} ${_moc_INCS} ${_header} -o ${_moc}
                                                          MAIN_DEPENDENCY ${_header})
                                        macro_add_file_dependencies(${_abs_FILE} ${_moc})
                                        SET_SOURCE_FILES_PROPERTIES(${_moc} GENERATED)
@@ -204,34 +204,6 @@ macro(lyx_const_touched_files _allinone_name _list)
        endforeach (_current_FILE)
 endmacro(lyx_const_touched_files)
 
-
-macro(lyx_qt_resources_file _qrc_name _to_dir _list)
-       if (NOT EXISTS ${_qrc_name})
-               set(_rebuild_file 1)
-       else()
-               FILE(READ ${_qrc_name} _file_content)
-               if (NOT _file_content)
-                       set(_rebuild_file 1)
-               endif()
-       endif()
-
-       if (_rebuild_file)
-               message(STATUS "Generating ${_qrc_name}")
-               file(WRITE  ${_qrc_name} "<!DOCTYPE RCC><RCC version=\"1.0\">\n")
-               file(APPEND  ${_qrc_name} "<qresource>\n")
-
-               foreach (_current_FILE ${${_list}})
-                       get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
-                       string(REGEX REPLACE "${_to_dir}" "" _file_name ${_abs_FILE})
-                       file(APPEND  ${_qrc_name} "      <file alias=\"${_file_name}\">${_abs_FILE}</file>\n")
-               endforeach (_current_FILE)
-
-               file(APPEND  ${_qrc_name} "</qresource>\n")
-               file(APPEND  ${_qrc_name} "</RCC>\n")
-       endif()
-endmacro(lyx_qt_resources_file)
-
-
 macro(LYX_OPTION_INIT)
        set(LYX_OPTIONS)
 endmacro()
@@ -241,6 +213,8 @@ macro(LYX_OPTION _name _description _default _sys)
        set(_msg OFF)
        if(${_sys} MATCHES "GCC")
                set(_system CMAKE_COMPILER_IS_GNUCXX)
+       elseif(${_sys} MATCHES "MAC")
+               set(_system APPLE)
        else()
                set(_system ${_sys})
        endif()
@@ -260,8 +234,20 @@ endmacro()
 
 
 macro(LYX_OPTION_LIST_ALL)
+       if(UNIX)
+               set(run_cmake ${CMAKE_BINARY_DIR}/run_cmake.sh)
+               file(WRITE ${run_cmake} "#!/bin/bash \n")
+               execute_process(COMMAND chmod 755 ${run_cmake})
+               set(cont "\\\n")
+       elseif(WIN32)
+               set(run_cmake ${CMAKE_BINARY_DIR}/run_cmake.bat)
+               file(WRITE ${run_cmake} "")
+               set(cont "<nul ^\n")
+       endif()
+       file(APPEND ${run_cmake} "cmake ${CMAKE_SOURCE_DIR}  ${cont}")
+       file(APPEND ${run_cmake} " -G\"${CMAKE_GENERATOR}\"  ${cont}")
        foreach(_option ${LYX_OPTIONS})
-               if(${_option}_show_message)
+               if(${_option}_show_message OR ${ARGV0} STREQUAL "help")
                        string(SUBSTRING "${_option}                            " 0 25 _var)
                        if(${_option})
                                set(_isset ON)
@@ -270,8 +256,13 @@ macro(LYX_OPTION_LIST_ALL)
                        endif()
                        string(SUBSTRING "${_isset}     " 0 4 _val)
                        message(STATUS "${_var}= ${_val}   : ${${_option}_description}")
+                       file(APPEND ${run_cmake} " -D${_option}=${${_option}}  ${cont}")
                endif()
        endforeach()
+       file(APPEND ${run_cmake} "\n")
+       message(STATUS)
+       message(STATUS "CMake command with options is available in shell script")
+       message(STATUS "    '${run_cmake}'")
 endmacro()
 
 macro(lyx_add_info_files group)
@@ -279,6 +270,7 @@ macro(lyx_add_info_files group)
                if(NOT IS_DIRECTORY ${_it})
                        get_filename_component(name ${_it} NAME)
                        if(NOT ${_it} MATCHES "^/\\\\..*$;~$")
+                               set_source_files_properties(${_it} PROPERTIES HEADER_FILE_ONLY TRUE)
                                set(lyx_${group}_info_files ${lyx_${group}_info_files} ${_it})
                        endif()
                endif()