dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 22:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt4Macros: Use get_property/set_property

Browse Source 
Replace use of old-style {get,set}_source_file_properties with newer
{get,set}_property.
This commit is contained in:
Matthew Woehlke
2018-05-11 12:43:55 -04:00
committed by Brad King
parent 72e9fcdf2f
commit 800b2fcf80
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/Qt4Macros.cmake
View File

@@ -151,7 +151,7 @@ macro (QT4_GENERATE_MOC infile outfile )
set(moc_target ${ARGV3}) set(moc_target ${ARGV3})
endif() endif()
QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "" "${moc_target}") QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "" "${moc_target}")
set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # don't run automoc on this file set_property(SOURCE ${outfile} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file
endmacro () endmacro ()
@@ -245,19 +245,19 @@ macro(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
set(_impl "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp") set(_impl "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp")
set(_moc "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc") set(_moc "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc")
get_source_file_property(_nonamespace ${_interface} NO_NAMESPACE) get_property(_nonamespace SOURCE ${_interface} PROPERTY NO_NAMESPACE)
if(_nonamespace) if(_nonamespace)
set(_params -N -m) set(_params -N -m)
else() else()
set(_params -m) set(_params -m)
endif() endif()
get_source_file_property(_classname ${_interface} CLASSNAME) get_property(_classname SOURCE ${_interface} PROPERTY CLASSNAME)
if(_classname) if(_classname)
set(_params ${_params} -c ${_classname}) set(_params ${_params} -c ${_classname})
endif() endif()
get_source_file_property(_include ${_interface} INCLUDE) get_property(_include SOURCE ${_interface} PROPERTY INCLUDE)
if(_include) if(_include)
set(_params ${_params} -i ${_include}) set(_params ${_params} -i ${_include})
endif() endif()
@@ -266,7 +266,7 @@ macro(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
COMMAND Qt4::qdbusxml2cpp ${_params} -p ${_basename} ${_infile} COMMAND Qt4::qdbusxml2cpp ${_params} -p ${_basename} ${_infile}
DEPENDS ${_infile} VERBATIM) DEPENDS ${_infile} VERBATIM)
set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE) set_property(SOURCE ${_impl} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file
QT4_GENERATE_MOC("${_header}" "${_moc}") QT4_GENERATE_MOC("${_header}" "${_moc}")
@@ -350,7 +350,7 @@ macro(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optional
endif() endif()
QT4_GENERATE_MOC("${_header}" "${_moc}") QT4_GENERATE_MOC("${_header}" "${_moc}")
set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE) set_property(SOURCE ${_impl} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file
MACRO_ADD_FILE_DEPENDENCIES("${_impl}" "${_moc}") MACRO_ADD_FILE_DEPENDENCIES("${_impl}" "${_moc}")
list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}") list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
@@ -374,7 +374,7 @@ macro(QT4_AUTOMOC)
# cmake is run for the very first time on them -> however the .cpp files might # cmake is run for the very first time on them -> however the .cpp files might
# exist at a later run. at that time we need to skip them, so that we don't add two # exist at a later run. at that time we need to skip them, so that we don't add two
# different rules for the same moc file # different rules for the same moc file
get_source_file_property(_skip ${_abs_FILE} SKIP_AUTOMOC) get_property(_skip SOURCE ${_abs_FILE} PROPERTY SKIP_AUTOMOC)
if ( NOT _skip AND EXISTS ${_abs_FILE} ) if ( NOT _skip AND EXISTS ${_abs_FILE} )
@@ -454,7 +454,7 @@ macro(QT4_ADD_TRANSLATION _qm_files)
foreach (_current_FILE ${ARGN}) foreach (_current_FILE ${ARGN})
get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE) get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
get_filename_component(qm ${_abs_FILE} NAME_WE) get_filename_component(qm ${_abs_FILE} NAME_WE)
get_source_file_property(output_location ${_abs_FILE} OUTPUT_LOCATION) get_property(output_location SOURCE ${_abs_FILE} PROPERTY OUTPUT_LOCATION)
if(output_location) if(output_location)
file(MAKE_DIRECTORY "${output_location}") file(MAKE_DIRECTORY "${output_location}")
set(qm "${output_location}/${qm}.qm") set(qm "${output_location}/${qm}.qm")