1.) some white spaces removed

2.) Using direct call to uic-qt4. This was needed to enable translated
    strings to appear in many dialogs.
    I needed some time to find out, why strings form autocof-build made
    it into the dialogs, but strings from cmake-build did not.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29234 a592a061-630c-0410-9148-cb99ea01b6c8

development/cmake/modules/LyXMacros.cmake

@@ -4,15 +4,15 @@
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions
 #  are met:
-#  
+#
 #  1. Redistributions of source code must retain the copyright
 #     notice, this list of conditions and the following disclaimer.
 #  2. Redistributions in binary form must reproduce the copyright
 #     notice, this list of conditions and the following disclaimer in the
 #     documentation and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products 
+#  3. The name of the author may not be used to endorse or promote products
 #     derived from this software without specific prior written permission.
-#  
+#
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 #  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 #  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -23,7 +23,7 @@
 #  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 #  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#  
+#
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
@@ -31,9 +31,9 @@ macro(lyx_add_path _list _prefix)
    set(_tmp)
    foreach(_current ${${_list}})
       set(_tmp ${_tmp} ${_prefix}/${_current})
-      #message( ${_prefix}/${_current})
+      #message(${_prefix}/${_current})
-   endforeach(_current)  	 
+   endforeach(_current)
-   set(${_list} ${_tmp})  
+   set(${_list} ${_tmp})
 endmacro(lyx_add_path _out _prefix)
 
 
@@ -48,18 +48,14 @@ macro(LYX_ADD_UI_FILES _sources _ui)
       set(_header ${CMAKE_CURRENT_BINARY_DIR}/ui_${_basename}.h)
 
       # we need to run uic and replace some things in the generated file
-      # this is done by executing the cmake script kde4uic.cmake
+      # this is done by executing the cmake script LyXuic.cmake
+      # ######
+      # Latest test showed on linux and windows show no bad consequeces,
+      # so we removed the call to LyXuic.cmake
       add_custom_command(OUTPUT ${_header}
-         COMMAND ${CMAKE_COMMAND}
+	 COMMAND ${QT_UIC_EXECUTABLE} -tr lyx::qt_ ${_tmp_FILE} -o ${_header}
-         ARGS
-         -DKDE4_HEADER:BOOL=ON
-         -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
-         -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
-         -DKDE_UIC_H_FILE:FILEPATH=${_header}
-         -DKDE_UIC_BASENAME:STRING=${_basename}
-         -P ${CMAKE_MODULE_PATH}/LyXuic.cmake
          MAIN_DEPENDENCY ${_tmp_FILE}
-      )
+)
       set(${_ui} ${${_ui}} ${_header})
    endforeach (_current_FILE)
 endmacro(LYX_ADD_UI_FILES)
@@ -67,11 +63,11 @@ endmacro(LYX_ADD_UI_FILES)
 
 
 macro(LYX_AUTOMOC)
-   if(QT4_GET_MOC_INC_DIRS)
+   if (QT4_GET_MOC_INC_DIRS)
       QT4_GET_MOC_INC_DIRS(_moc_INCS)
    endif()
 
-   set(_matching_FILES )
+   set(_matching_FILES)
    foreach (_current_FILE ${ARGN})
 
       get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
@@ -90,23 +86,23 @@ macro(LYX_AUTOMOC)
 
          get_filename_component(_abs_PATH ${_abs_FILE} PATH)
 
-         string(REGEX MATCHALL "#include +[\"<]moc_[^ ]+\\.cpp[\">]" _match "${_contents}")
+         string(REGEX MATCHALL "#include +[^ ]+_moc\\.cpp[\">]" _match "${_contents}")
          if (_match)
             foreach (_current_MOC_INC ${_match})
-               string(REGEX MATCH "moc_[^ <\"]+\\.cpp" _current_MOC "${_current_MOC_INC}")
+               string(REGEX MATCH "[^ <\"]+_moc\\.cpp" _current_MOC "${_current_MOC_INC}")
 
-               get_filename_component(_basename ${_current_MOC} NAME_WE)               
+               get_filename_component(_basename ${_current_MOC} NAME_WE)
 
                string(LENGTH ${_basename} _length)
                MATH(EXPR _mocless_length ${_length}-4)
-               STRING(SUBSTRING  ${_basename} 4 ${_mocless_length} _mocless_name )
+               STRING(SUBSTRING  ${_basename} 0 ${_mocless_length} _mocless_name)
 
                set(_header ${_abs_PATH}/${_mocless_name}.h)
 
                #message(STATUS "moc : ${_header}")
                #set(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h)
                #set(_header ${_abs_PATH}/${_basename}.h)
-               
+
                set(_moc  ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
                #set(_moc ${_abs_PATH}/${_current_MOC})
                add_custom_command(OUTPUT ${_moc}
@@ -128,8 +124,8 @@ macro(lyx_const_touched_files _allinone_name _list)
    set(_file_list ${_allinone_name}_files)
    set(_file_const ${CMAKE_CURRENT_BINARY_DIR}/${_allinone_name}_const.C)
    set(_file_touched ${CMAKE_CURRENT_BINARY_DIR}/${_allinone_name}_touched.C)
-   
+
-   
+
    # don't touch exisiting or non-empty file,
    # so a cmake re-run doesn't touch all created files
    set(_rebuild_file_const 0)
@@ -141,7 +137,7 @@ macro(lyx_const_touched_files _allinone_name _list)
          set(_rebuild_file_const 1)
       endif()
    endif()
-   
+
    set(_rebuild_file_touched 0)
    if (NOT EXISTS ${_file_touched})
       set(_rebuild_file_touched 1)
@@ -149,14 +145,14 @@ macro(lyx_const_touched_files _allinone_name _list)
       FILE(READ ${_file_touched} _file_content)
       if (NOT _file_content)
          set(_rebuild_file_touched 1)
-      endif()   
+      endif()
    endif()
-   
+
    if (merge_rebuild)
       set(_rebuild_file_const 1)
       set(_rebuild_file_touched 1)
    endif()
-   
+
    if (_rebuild_file_const)
       file(WRITE  ${_file_const} "// autogenerated file \n//\n")
       file(APPEND ${_file_const} "//    * clear or delete this file to build it again by cmake \n//\n\n")
@@ -169,9 +165,9 @@ macro(lyx_const_touched_files _allinone_name _list)
       file(APPEND ${_file_touched} "#define DONT_INCLUDE_CONST_FILES\n")
       file(APPEND ${_file_touched} "#include \"${_file_const}\"\n\n\n")
    endif()
-   
+
    set(${_file_list} ${_file_const} ${_file_touched})
-   
+
    foreach (_current_FILE ${${_list}})
       get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
       # don't include any generated files in the final-file
@@ -181,16 +177,16 @@ macro(lyx_const_touched_files _allinone_name _list)
          list(APPEND ${_file_list} ${_abs_FILE})
       else()
         GET_FILENAME_COMPONENT(_file_name ${_abs_FILE} NAME_WE)
-        STRING(REGEX REPLACE "-" "_" _file_name "${_file_name}" )
+        STRING(REGEX REPLACE "-" "_" _file_name "${_file_name}")
         set(__macro_name ${_file_name}___ASSUME_CONST)
-        
+
         if (_rebuild_file_const)
            file(APPEND ${_file_const}  "#define ${__macro_name}\n")
            file(APPEND ${_file_const}  "#if defined(${__macro_name}) && !defined(DONT_INCLUDE_CONST_FILES)\n")
            file(APPEND ${_file_const}  "#include \"${_abs_FILE}\"\n")
            file(APPEND ${_file_const}  "#endif\n\n")
         endif()
-        
+
         if (_rebuild_file_touched)
            file(APPEND ${_file_touched}  "#ifndef ${__macro_name}\n")
            file(APPEND ${_file_touched}  "#include \"${_abs_FILE}\"\n")
@@ -201,7 +197,7 @@ macro(lyx_const_touched_files _allinone_name _list)
 endmacro(lyx_const_touched_files)
 
 
-macro(lyx_qt_resources_file _qrc_name _to_dir _list) 
+macro(lyx_qt_resources_file _qrc_name _to_dir _list)
    if (NOT EXISTS ${_qrc_name})
       set(_rebuild_file 1)
    else()
@@ -210,18 +206,18 @@ macro(lyx_qt_resources_file _qrc_name _to_dir _list)
          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()