diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackWIX.cmake | 4 | ||||
| -rw-r--r-- | Modules/Qt4Macros.cmake | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 7c7d924..f4fcf6a 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -12,7 +12,7 @@ # # .. variable:: CPACK_WIX_UPGRADE_GUID # -# Upgrade GUID (Product/@UpgradeCode) +# Upgrade GUID (``Product/@UpgradeCode``) # # Will be automatically generated unless explicitly provided. # @@ -33,7 +33,7 @@ # # .. variable:: CPACK_WIX_PRODUCT_GUID # -# Product GUID (Product/@Id) +# Product GUID (``Product/@Id``) # # Will be automatically generated unless explicitly provided. # diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index e56634d..b5f005f 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -432,15 +432,16 @@ macro(QT4_CREATE_TRANSLATION _qm_files) set(_ts_pro ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_ts_name}_lupdate.pro) set(_pro_srcs) foreach(_pro_src ${_my_sources}) - set(_pro_srcs "${_pro_srcs} \"${_pro_src}\"") + set(_pro_srcs "${_pro_srcs} \\\n \"${_pro_src}\"") endforeach() set(_pro_includes) get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES) + list(REMOVE_DUPLICATES _inc_DIRS) foreach(_pro_include ${_inc_DIRS}) get_filename_component(_abs_include "${_pro_include}" ABSOLUTE) - set(_pro_includes "${_pro_includes} \"${_abs_include}\"") + set(_pro_includes "${_pro_includes} \\\n \"${_abs_include}\"") endforeach() - file(WRITE ${_ts_pro} "SOURCES = ${_pro_srcs}\nINCLUDEPATH = ${_pro_includes}\n") + file(WRITE ${_ts_pro} "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n") endif() add_custom_command(OUTPUT ${_ts_file} COMMAND ${QT_LUPDATE_EXECUTABLE} |