X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fmodules%2FFindQt4.cmake;h=066124a3219d7d16ea71cf4002cebc788cdd459b;hb=e4842c77d6e210919d00c103e1d33f973ac96033;hp=db89708bb733c5d3b87e332b844ac510369f5c02;hpb=026013e1eb6c820c062419387c778dac16ed095a;p=lyx.git

diff --git a/development/cmake/modules/FindQt4.cmake b/development/cmake/modules/FindQt4.cmake
index db89708bb7..066124a321 100644
--- a/development/cmake/modules/FindQt4.cmake
+++ b/development/cmake/modules/FindQt4.cmake
@@ -758,19 +758,39 @@ if(QT4_QMAKE_FOUND)
   ENDMACRO (QT4_WRAP_CPP)
 
 
+
+
+macro (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
+	set(${_qt4_files})
+	set(${_qt4_options})
+	set(_QT4_DOING_OPTIONS FALSE)
+	foreach (_currentArg ${ARGN})
+		if ("${_currentArg}" STREQUAL "OPTIONS")
+			set(_QT4_DOING_OPTIONS TRUE)
+		else ()
+			if (_QT4_DOING_OPTIONS)
+				list(APPEND ${_qt4_options} "${_currentArg}")
+			else()
+				list(APPEND ${_qt4_files} "${_currentArg}")
+			endif()
+		endif()
+	endforeach()
+endmacro()
+
   # QT4_WRAP_UI(outfiles inputfile ... )
 
   MACRO (QT4_WRAP_UI outfiles )
+    QT4_EXTRACT_OPTIONS(ui_files_list ui_options ${ARGN})
+    FOREACH (it ${ui_files_list})
 
-    FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
       GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+
       set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_UIC_EXECUTABLE}
-        ARGS -o ${outfile} ${infile}
+        ARGS ${ui_options} -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile})
-      set(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)
 
   ENDMACRO (QT4_WRAP_UI)
@@ -787,7 +807,7 @@ if(QT4_QMAKE_FOUND)
       set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_RCC_EXECUTABLE}
-        ARGS -o ${outfile} ${infile}
+        ARGS -name ${outfilename} -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile} )
       set(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)