From d98faf5345e604b9e4631c8b2d6501c9bb06bdc2 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Tue, 26 Aug 2008 23:18:35 +0000 Subject: Allow a classname to be specified for QT_ADD_DBUS_INTERFACE, and document the possibility for setting a header to include. svn path=/trunk/KDE/kdelibs/; revision=852986 --- modules/FindQt4.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index fec95c6e..513b0cfe 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -85,6 +85,10 @@ # the list of sources. # To disable generating a namespace header, set the source file property # NO_NAMESPACE to TRUE on the interface file. +# To include a header in the interface header, set the source file property +# INCLUDE to the name of the header. +# To specify a class name to use, set the source file property CLASSNAME +# to the name of the class. # # macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... ) # create the interface header and implementation files @@ -92,6 +96,10 @@ # the name will be automatically determined from the name of the xml file # To disable generating namespace headers, set the source file property # NO_NAMESPACE to TRUE for these inputfiles. +# To include a header in the interface header, set the source file property +# INCLUDE to the name of the header. +# To specify a class name to use, set the source file property CLASSNAME +# to the name of the class. # # macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] [classname]) # create a dbus adaptor (header and implementation file) from the xml file @@ -1268,6 +1276,11 @@ IF (QT4_QMAKE_FOUND) SET(_params -m) ENDIF ( _nonamespace ) + GET_SOURCE_FILE_PROPERTY(_classname ${_interface} CLASSNAME) + IF ( _classname ) + SET(_params ${_params} -c ${_classname}) + ENDIF ( _classname ) + GET_SOURCE_FILE_PROPERTY(_include ${_interface} INCLUDE) IF ( _include ) SET(_params ${_params} -i ${_include}) -- cgit v1.2.1 From c39c2245fe6429e2749a2a9d94d0cbf30b50f7ab Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 29 Aug 2008 10:38:09 +0000 Subject: merge 850650 here svn path=/trunk/KDE/kdelibs/; revision=854302 --- modules/FindEigen2.cmake | 1 + modules/MacroOptionalDependPackage.cmake | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake index 59eb1dfc..7f6edf94 100644 --- a/modules/FindEigen2.cmake +++ b/modules/FindEigen2.cmake @@ -19,6 +19,7 @@ find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core PATHS ${INCLUDE_INSTALL_DIR}/eigen2 ${KDE4_INCLUDE_DIR}/eigen2 + ${CMAKE_INCLUDE_PATH}/eigen2 ) include(FindPackageHandleStandardArgs) diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake index 1a6df36a..fd82b567 100644 --- a/modules/MacroOptionalDependPackage.cmake +++ b/modules/MacroOptionalDependPackage.cmake @@ -13,10 +13,11 @@ MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) set(_packagename Find${_name}.cmake) find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) if(NOT _PACKAGE_DEPEND_FOUND) - MESSAGE(STATUS "cmake package ${_packagename} was not found. This package needs ${_module_needed} to be compile all program") - set(DEPEND_PACKAGE_${_name} FALSE) + MESSAGE(STATUS "cmake package ${_packagename} not found, optional dependency ${_module_needed}") + set(DEPEND_PACKAGE_${_name} FALSE) else(NOT _PACKAGE_DEPEND_FOUND) - set(DEPEND_PACKAGE_${_name} TRUE) + set(DEPEND_PACKAGE_${_name} TRUE) endif(NOT _PACKAGE_DEPEND_FOUND) + macro_log_feature(_PACKAGE_DEPEND_FOUND "${_packagename}" "${_module_needed}" "" FALSE "" "Optional dependency") ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) -- cgit v1.2.1 From 9c72dc264f879ad796dfbf5721abed50e9367410 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 29 Aug 2008 10:38:55 +0000 Subject: not supposed to be committed svn path=/trunk/KDE/kdelibs/; revision=854303 --- modules/MacroOptionalDependPackage.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake index fd82b567..1a6df36a 100644 --- a/modules/MacroOptionalDependPackage.cmake +++ b/modules/MacroOptionalDependPackage.cmake @@ -13,11 +13,10 @@ MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) set(_packagename Find${_name}.cmake) find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) if(NOT _PACKAGE_DEPEND_FOUND) - MESSAGE(STATUS "cmake package ${_packagename} not found, optional dependency ${_module_needed}") - set(DEPEND_PACKAGE_${_name} FALSE) + MESSAGE(STATUS "cmake package ${_packagename} was not found. This package needs ${_module_needed} to be compile all program") + set(DEPEND_PACKAGE_${_name} FALSE) else(NOT _PACKAGE_DEPEND_FOUND) - set(DEPEND_PACKAGE_${_name} TRUE) + set(DEPEND_PACKAGE_${_name} TRUE) endif(NOT _PACKAGE_DEPEND_FOUND) - macro_log_feature(_PACKAGE_DEPEND_FOUND "${_packagename}" "${_module_needed}" "" FALSE "" "Optional dependency") ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) -- cgit v1.2.1 From 40413ebf9d94f41ac11113a625b6f22df8f4d88c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 29 Aug 2008 11:39:27 +0000 Subject: CMAKE_INCLUDE_PATH is always empty here for some reason, so I need the explicit path listed svn path=/trunk/KDE/kdelibs/; revision=854321 --- modules/FindEigen2.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake index 7f6edf94..d5ffc2c2 100644 --- a/modules/FindEigen2.cmake +++ b/modules/FindEigen2.cmake @@ -20,6 +20,7 @@ find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core ${INCLUDE_INSTALL_DIR}/eigen2 ${KDE4_INCLUDE_DIR}/eigen2 ${CMAKE_INCLUDE_PATH}/eigen2 + /usr/include/eigen2 ) include(FindPackageHandleStandardArgs) -- cgit v1.2.1