X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fmodules%2FLyXMacros.cmake;h=816112eb544f9f54c3ad1dccd7f7ec3007be89f7;hb=d854ded56eb2241028380ec053425bdf830b6b12;hp=4d247d9598b4fe9f776ed5da53d6c5d8ee436c66;hpb=445713eae85cdd63670204d3c0167336cf6e70ed;p=lyx.git

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index 4d247d9598..816112eb54 100644
--- 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)
@@ -229,6 +229,13 @@ macro(lyx_qt_resources_file _qrc_name _to_dir _list)
 		file(APPEND  ${_qrc_name} "</qresource>\n")
 		file(APPEND  ${_qrc_name} "</RCC>\n")
 	endif()
+	if(NOT WIN32)
+	  add_custom_command(
+	    OUTPUT ${_qrc_name}
+	    COMMAND ${CMAKE_COMMAND} --build "${CMAKE_BINARY_DIR}" --target rebuild_cache
+	    )
+	endif()
+
 endmacro(lyx_qt_resources_file)
 
 
@@ -262,6 +269,18 @@ 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 OR ${ARGV0} STREQUAL "help")
 			string(SUBSTRING "${_option}                            " 0 25 _var)
@@ -272,8 +291,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)