From 7554247f1269f3403538455e43ac5988d6793311 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 4 Jul 2006 14:28:46 +0000 Subject: -support an additional optional basename parameter for QT4_ADD_DBUS_ADAPTER() -support new and improved RPATH handling in cmake 2.4.3 -minor cleanups in kdelibs/CMakeLists.txt -use ${BIN_INSTALL_DIR} instead of bin as install target Alex svn path=/trunk/KDE/kdelibs/; revision=558004 The following changes were in SVN, but were removed from git: M pics/CMakeLists.txt --- modules/FindQt4.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'modules/FindQt4.cmake') diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index caf8a3c5..24dab37d 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -38,7 +38,7 @@ # for all listed interface xml files # the name will be automatically determined from the name of the xml file # -# macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname ) +# macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] ) # create a dbus adaptor (header and implementation file) from the xml file # describing the interface, and add it to the list of sources. The adaptor # forwards the calls to a parent class, defined in parentheader and named @@ -885,8 +885,13 @@ IF (QT4_QMAKE_FOUND) MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE) - STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile}) - STRING(TOLOWER ${_basename} _basename) + + IF (ARGV1) + SET(_basename ${ARGV1} ) + ELSE (ARGV1) + STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile}) + STRING(TOLOWER ${_basename} _basename) + ENDIF (ARGV1) SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) -- cgit v1.2.1