1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Use lower-case macro/function names

Browse Source 
CMake is case-insensitive for macro and function names. Still, it is
"strongly recommended to stay with the case chosen in the function
definition." So let's make the function and macro definition lower-case,
like we also recommend in the documentation.

Change-Id: I1f64b18716f034cb696d2e19a2b380aaadd6cd07
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Kai Koehne 2019-11-26 15:48:29 +01:00
parent fea316cbe7
commit b6632443d4
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/corelib/Qt5CoreMacros.cmake
View File

@ -39,7 +39,7 @@
include(CMakeParseArguments) include(CMakeParseArguments)
# macro used to create the names of output files preserving relative dirs # macro used to create the names of output files preserving relative dirs
macro(QT5_MAKE_OUTPUT_FILE infile prefix ext outfile ) macro(qt5_make_output_file infile prefix ext outfile )
string(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength) string(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
string(LENGTH ${infile} _infileLength) string(LENGTH ${infile} _infileLength)
set(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR}) set(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
@ -65,7 +65,7 @@ macro(QT5_MAKE_OUTPUT_FILE infile prefix ext outfile )
endmacro() endmacro()
macro(QT5_GET_MOC_FLAGS _moc_flags) macro(qt5_get_moc_flags _moc_flags)
set(${_moc_flags}) set(${_moc_flags})
get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES) get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
@ -97,7 +97,7 @@ endmacro()
# helper macro to set up a moc rule # helper macro to set up a moc rule
function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target moc_depends) function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target moc_depends)
# Pass the parameters in a file. Set the working directory to # Pass the parameters in a file. Set the working directory to
# be that containing the parameters file and reference it by # be that containing the parameters file and reference it by
# just the file name. This is necessary because the moc tool on # just the file name. This is necessary because the moc tool on
@ -143,7 +143,7 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
endfunction() endfunction()
function(QT5_GENERATE_MOC infile outfile ) function(qt5_generate_moc infile outfile )
# get include dirs and flags # get include dirs and flags
qt5_get_moc_flags(moc_flags) qt5_get_moc_flags(moc_flags)
get_filename_component(abs_infile ${infile} ABSOLUTE) get_filename_component(abs_infile ${infile} ABSOLUTE)
@ -160,7 +160,7 @@ endfunction()
# qt5_wrap_cpp(outfiles inputfile ... ) # qt5_wrap_cpp(outfiles inputfile ... )
function(QT5_WRAP_CPP outfiles ) function(qt5_wrap_cpp outfiles )
# get include dirs # get include dirs
qt5_get_moc_flags(moc_flags) qt5_get_moc_flags(moc_flags)
@ -189,7 +189,7 @@ endfunction()
# _qt5_parse_qrc_file(infile _out_depends _rc_depends) # _qt5_parse_qrc_file(infile _out_depends _rc_depends)
# internal # internal
function(_QT5_PARSE_QRC_FILE infile _out_depends _rc_depends) function(_qt5_parse_qrc_file infile _out_depends _rc_depends)
get_filename_component(rc_path ${infile} PATH) get_filename_component(rc_path ${infile} PATH)
if(EXISTS "${infile}") if(EXISTS "${infile}")
@ -222,7 +222,7 @@ endfunction()
# qt5_add_binary_resources(target inputfiles ... ) # qt5_add_binary_resources(target inputfiles ... )
function(QT5_ADD_BINARY_RESOURCES target ) function(qt5_add_binary_resources target )
set(options) set(options)
set(oneValueArgs DESTINATION) set(oneValueArgs DESTINATION)
@ -241,7 +241,7 @@ function(QT5_ADD_BINARY_RESOURCES target )
foreach(it ${rcc_files}) foreach(it ${rcc_files})
get_filename_component(infile ${it} ABSOLUTE) get_filename_component(infile ${it} ABSOLUTE)
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) _qt5_parse_qrc_file(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
set(infiles ${infiles} ${infile}) set(infiles ${infiles} ${infile})
set(out_depends ${out_depends} ${_out_depends}) set(out_depends ${out_depends} ${_out_depends})
@ -258,7 +258,7 @@ endfunction()
# qt5_add_resources(outfiles inputfile ... ) # qt5_add_resources(outfiles inputfile ... )
function(QT5_ADD_RESOURCES outfiles ) function(qt5_add_resources outfiles )
set(options) set(options)
set(oneValueArgs) set(oneValueArgs)
@ -278,7 +278,7 @@ function(QT5_ADD_RESOURCES outfiles )
get_filename_component(infile ${it} ABSOLUTE) get_filename_component(infile ${it} ABSOLUTE)
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) _qt5_parse_qrc_file(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
add_custom_command(OUTPUT ${outfile} add_custom_command(OUTPUT ${outfile}
@ -295,7 +295,7 @@ endfunction()
# qt5_add_big_resources(outfiles inputfile ... ) # qt5_add_big_resources(outfiles inputfile ... )
function(QT5_ADD_BIG_RESOURCES outfiles ) function(qt5_add_big_resources outfiles )
if (CMAKE_VERSION VERSION_LESS 3.9) if (CMAKE_VERSION VERSION_LESS 3.9)
message(FATAL_ERROR, "qt5_add_big_resources requires CMake 3.9 or newer") message(FATAL_ERROR, "qt5_add_big_resources requires CMake 3.9 or newer")
endif() endif()
@ -319,7 +319,7 @@ function(QT5_ADD_BIG_RESOURCES outfiles )
set(tmpoutfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}tmp.cpp) set(tmpoutfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}tmp.cpp)
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.o) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.o)
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) _qt5_parse_qrc_file(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
add_custom_command(OUTPUT ${tmpoutfile} add_custom_command(OUTPUT ${tmpoutfile}
COMMAND ${Qt5Core_RCC_EXECUTABLE} ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile} COMMAND ${Qt5Core_RCC_EXECUTABLE} ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile}
@ -389,7 +389,7 @@ macro(qt5_use_modules _target _link_type)
endforeach() endforeach()
endmacro() endmacro()
function(QT5_IMPORT_PLUGINS TARGET_NAME) function(qt5_import_plugins TARGET_NAME)
set(_doing "") set(_doing "")
foreach(_arg ${ARGN}) foreach(_arg ${ARGN})
if(_arg STREQUAL "INCLUDE") if(_arg STREQUAL "INCLUDE")

8
src/dbus/Qt5DBusMacros.cmake
View File

@ -34,7 +34,7 @@ include(MacroAddFileDependencies)
include(CMakeParseArguments) include(CMakeParseArguments)
function(QT5_ADD_DBUS_INTERFACE _sources _interface _basename) function(qt5_add_dbus_interface _sources _interface _basename)
get_filename_component(_infile ${_interface} ABSOLUTE) get_filename_component(_infile ${_interface} ABSOLUTE)
set(_header "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h") set(_header "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h")
set(_impl "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp") set(_impl "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp")
@ -71,7 +71,7 @@ function(QT5_ADD_DBUS_INTERFACE _sources _interface _basename)
endfunction() endfunction()
function(QT5_ADD_DBUS_INTERFACES _sources) function(qt5_add_dbus_interfaces _sources)
foreach(_current_FILE ${ARGN}) foreach(_current_FILE ${ARGN})
get_filename_component(_infile ${_current_FILE} ABSOLUTE) get_filename_component(_infile ${_current_FILE} ABSOLUTE)
get_filename_component(_basename ${_current_FILE} NAME) get_filename_component(_basename ${_current_FILE} NAME)
@ -84,7 +84,7 @@ function(QT5_ADD_DBUS_INTERFACES _sources)
endfunction() endfunction()
function(QT5_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options ) function(qt5_generate_dbus_interface _header) # _customName OPTIONS -some -options )
set(options) set(options)
set(oneValueArgs) set(oneValueArgs)
set(multiValueArgs OPTIONS) set(multiValueArgs OPTIONS)
@ -117,7 +117,7 @@ function(QT5_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -optio
endfunction() endfunction()
function(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName) function(qt5_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
get_filename_component(_infile ${_xml_file} ABSOLUTE) get_filename_component(_infile ${_xml_file} ABSOLUTE)
set(_optionalBasename "${ARGV4}") set(_optionalBasename "${ARGV4}")

2
src/widgets/Qt5WidgetsMacros.cmake
View File

@ -41,7 +41,7 @@ include(CMakeParseArguments)
# qt5_wrap_ui(outfiles inputfile ... ) # qt5_wrap_ui(outfiles inputfile ... )
function(QT5_WRAP_UI outfiles ) function(qt5_wrap_ui outfiles )
set(options) set(options)
set(oneValueArgs) set(oneValueArgs)
set(multiValueArgs OPTIONS) set(multiValueArgs OPTIONS)