Differential D22698 Diff 62434 cmake/KF5I18nMacros.cmake.in

Changeset View

Standalone View

View Options

cmake/KF5I18nMacros.cmake.in

Context not available.
42set(_ki18n_build_tsfiles_script ${CMAKE_CURRENT_LIST_DIR}/build-tsfiles.cmake) 42​set(_ki18n_build_tsfiles_script ${CMAKE_CURRENT_LIST_DIR}/build-tsfiles.cmake)
43 43​
44#create the implementation files from the ui files and add them to the list of sources 44​#create the implementation files from the ui files and add them to the list of sources
45#usage: KI18N_WRAP_UI(foo_SRCS ${ui_files}) 45​#usage: KI18N_WRAP_UI(foo_SRCS ${ui_files}) or KI18N_WRAP_UI(TARGET ${ui_files})
46macro (KI18N_WRAP_UI _sources ) 46​macro (KI18N_WRAP_UI _sources )
47 if(NOT TARGET Qt5::uic) 47​ if(NOT TARGET Qt5::uic)
48 message(FATAL_ERROR "Qt5Widgets should be found before calling ki18n_wrap_ui(). Please add find_package(Qt5Widgets ...)") 48​ message(FATAL_ERROR "Qt5Widgets should be found before calling ki18n_wrap_ui(). Please add find_package(Qt5Widgets ...)")
Context not available.
68 MAIN_DEPENDENCY ${_tmp_FILE} 68​ MAIN_DEPENDENCY ${_tmp_FILE}
69 ) 69​ )
70 set_source_files_properties(${_header} PROPERTIES SKIP_AUTOMOC ON) 70​ set_source_files_properties(${_header} PROPERTIES SKIP_AUTOMOC ON)
71 list(APPEND ${_sources} ${_header}) 71​ if(TARGET ${_sources})
72​ cmake_minimum_required(VERSION 3.1)
kropUnsubmitted
Done

same thing as D22699. A macro must not change the minimum required version. (ki18n already requires CMake 3.5 anyway)

krop: same thing as D22699. A macro must not change the minimum required version. (ki18n already…
73​ target_sources(${_sources} PRIVATE ${_header})
74​ else()
75​ list(APPEND ${_sources} ${_header})
76​ endif()
72 endforeach (_current_FILE) 77​ endforeach (_current_FILE)
turbovUnsubmitted
Not Done

Its _Modern CMake_ :) no need to use that crap anymore %)
(I'm talking about matched end*(<BLAH-BLAH>) things %)

turbov: Its _Modern CMake_ :) no need to use that crap anymore %) (I'm talking about matched `end*…
73endmacro (KI18N_WRAP_UI) 78​endmacro (KI18N_WRAP_UI)
74 79​
Context not available.