@ -14,6 +14,14 @@
# add_executable ( myexe main.cpp ) # add_executable ( myexe main.cpp )
# target_link_libraries ( myexe ${ QT_LIBRARIES } ) # target_link_libraries ( myexe ${ QT_LIBRARIES } )
# #
# T h e m i n i m u m r e q u i r e d v e r s i o n c a n b e s p e c i f i e d u s i n g t h e s t a n d a r d find_package ( ) - s y n t a x
# ( s e e e x a m p l e a b o v e ) .
# F o r c o m p a t i b i l i t y w i t h o l d e r v e r s i o n s o f F i n d Q t 4 . c m a k e i t i s a l s o p o s s i b l e t o
# s e t t h e v a r i a b l e Q T _ M I N _ V E R S I O N t o t h e m i n i m u m r e q u i r e d v e r s i o n o f Q t 4 b e f o r e t h e
# find_package ( Qt4 ) c o m m a n d .
# I f b o t h a r e u s e d , t h e v e r s i o n u s e d i n t h e find_package ( ) c o m m a n d o v e r r i d e s t h e
# o n e f r o m Q T _ M I N _ V E R S I O N .
#
# W h e n u s i n g t h e c o m p o n e n t s a r g u m e n t , Q T _ U S E _ Q T * v a r i a b l e s a r e a u t o m a t i c a l l y s e t # W h e n u s i n g t h e c o m p o n e n t s a r g u m e n t , Q T _ U S E _ Q T * v a r i a b l e s a r e a u t o m a t i c a l l y s e t
# f o r t h e Q T _ U S E _ F I L E t o p i c k u p . I f o n e w i s h e s t o m a n u a l l y s e t t h e m , t h e # f o r t h e Q T _ U S E _ F I L E t o p i c k u p . I f o n e w i s h e s t o m a n u a l l y s e t t h e m , t h e
# a v a i l a b l e o n e s t o s e t i n c l u d e : # a v a i l a b l e o n e s t o s e t i n c l u d e :
@ -90,18 +98,21 @@
# f o r a l l l i s t e d i n t e r f a c e x m l f i l e s # f o r a l l l i s t e d i n t e r f a c e x m l f i l e s
# t h e n a m e w i l l b e a u t o m a t i c a l l y d e t e r m i n e d f r o m t h e n a m e o f t h e x m l f i l e # t h e n a m e w i l l b e a u t o m a t i c a l l y d e t e r m i n e d f r o m t h e n a m e o f t h e x m l f i l e
# #
# m a c r o QT4_ADD_DBUS_ADAPTOR ( outfiles xmlfile parentheader parentclassname [basename] ) # m a c r o QT4_ADD_DBUS_ADAPTOR ( outfiles xmlfile parentheader parentclassname [basename] [classname] )
# c r e a t e a d b u s adaptor ( header and implementation file ) f r o m t h e x m l f i l e # c r e a t e a d b u s adaptor ( header and implementation file ) f r o m t h e x m l f i l e
# d e s c r i b i n g t h e i n t e r f a c e , a n d a d d i t t o t h e l i s t o f s o u r c e s . T h e a d a p t o r # d e s c r i b i n g t h e i n t e r f a c e , a n d a d d i t t o t h e l i s t o f s o u r c e s . T h e a d a p t o r
# f o r w a r d s t h e c a l l s t o a p a r e n t c l a s s , d e f i n e d i n p a r e n t h e a d e r a n d n a m e d # f o r w a r d s t h e c a l l s t o a p a r e n t c l a s s , d e f i n e d i n p a r e n t h e a d e r a n d n a m e d
# p a r e n t c l a s s n a m e . T h e n a m e o f t h e g e n e r a t e d f i l e s w i l l b e # p a r e n t c l a s s n a m e . T h e n a m e o f t h e g e n e r a t e d f i l e s w i l l b e
# < b a s e n a m e > a d a p t o r . { c p p , h } w h e r e b a s e n a m e i s t h e b a s e n a m e o f t h e x m l f i l e . # < b a s e n a m e > a d a p t o r . { c p p , h } w h e r e b a s e n a m e d e f a u l t s t o t h e b a s e n a m e o f t h e x m l f i l e .
# I f < c l a s s n a m e > i s p r o v i d e d , t h e n i t w i l l b e u s e d a s t h e c l a s s n a m e o f t h e
# a d a p t o r i t s e l f .
# #
# m a c r o QT4_GENERATE_DBUS_INTERFACE ( header [interfacename] ) # m a c r o QT4_GENERATE_DBUS_INTERFACE ( header [interfacename] OPTIONS ... )
# g e n e r a t e t h e x m l i n t e r f a c e f i l e f r o m t h e g i v e n h e a d e r . # g e n e r a t e t h e x m l i n t e r f a c e f i l e f r o m t h e g i v e n h e a d e r .
# I f t h e o p t i o n a l a r g u m e n t i n t e r f a c e n a m e i s o m i t t e d , t h e n a m e o f t h e # I f t h e o p t i o n a l a r g u m e n t i n t e r f a c e n a m e i s o m i t t e d , t h e n a m e o f t h e
# i n t e r f a c e f i l e i s c o n s t r u c t e d f r o m t h e b a s e n a m e o f t h e h e a d e r w i t h # i n t e r f a c e f i l e i s c o n s t r u c t e d f r o m t h e b a s e n a m e o f t h e h e a d e r w i t h
# t h e s u f f i x . x m l a p p e n d e d . # t h e s u f f i x . x m l a p p e n d e d .
# O p t i o n s m a y b e g i v e n t o q d b u s c p p 2 x m l , s u c h a s t h o s e f o u n d w h e n e x e c u t i n g " q d b u s c p p 2 x m l - - h e l p "
# #
# m a c r o QT4_CREATE_TRANSLATION ( qm_files directories ... sources ... # m a c r o QT4_CREATE_TRANSLATION ( qm_files directories ... sources ...
# t s _ f i l e s . . . O P T I O N S . . . ) # t s _ f i l e s . . . O P T I O N S . . . )
@ -162,6 +173,9 @@
# Q T _ P H O N O N _ F O U N D T r u e i f p h o n o n w a s f o u n d . # Q T _ P H O N O N _ F O U N D T r u e i f p h o n o n w a s f o u n d .
# Q T _ Q T S C R I P T T O O L S _ F O U N D T r u e i f Q t S c r i p t T o o l s w a s f o u n d . # Q T _ Q T S C R I P T T O O L S _ F O U N D T r u e i f Q t S c r i p t T o o l s w a s f o u n d .
# #
# Q T _ M A C _ U S E _ C O C O A F o r M a c O S X , i t s w h e t h e r C o c o a o r C a r b o n i s u s e d .
# I n g e n e r a l , t h i s s h o u l d n o t b e u s e d , b u t i t s u s e f u l
# w h e n h a v i n g p l a t f o r m s p e c i f i c c o d e .
# #
# Q T _ D E F I N I T I O N S D e f i n i t i o n s t o u s e w h e n c o m p i l i n g c o d e t h a t u s e s Q t . # Q T _ D E F I N I T I O N S D e f i n i t i o n s t o u s e w h e n c o m p i l i n g c o d e t h a t u s e s Q t .
# Y o u d o n o t n e e d t o u s e t h i s i f y o u i n c l u d e Q T _ U S E _ F I L E . # Y o u d o n o t n e e d t o u s e t h i s i f y o u i n c l u d e Q T _ U S E _ F I L E .
@ -409,8 +423,6 @@ IF (QT_QMAKE_EXECUTABLE)
# S u p p p o r t f i n d i n g a t l e a s t a p a r t i c u l a r v e r s i o n , f o r i n s t a n c e FIND_PACKAGE ( Qt4 4.4.3 )
# S u p p p o r t f i n d i n g a t l e a s t a p a r t i c u l a r v e r s i o n , f o r i n s t a n c e FIND_PACKAGE ( Qt4 4.4.3 )
# T h i s i m p l e m e n t a t i o n i s a h a c k t o a v o i d d u p l i c a t i n g c o d e a n d m a k e s u r e w e s t a y
# T h i s i m p l e m e n t a t i o n i s a h a c k t o a v o i d d u p l i c a t i n g c o d e a n d m a k e s u r e w e s t a y
# s o u r c e - c o m p a t i b l e w i t h C M a k e 2 . 6 . x
# s o u r c e - c o m p a t i b l e w i t h C M a k e 2 . 6 . x
# F o r C M a k e 2 . 8 , w e s h o u l d n o t s e t Q T _ M I N _ V E R S I O N b u t o n l y u s e Q t 4 _ F I N D _ V E R S I O N _ M A J O R ,
# Q t 4 _ F I N D _ V E R S I O N _ M I N O R , e t c
IF ( Qt4_FIND_VERSION )
IF ( Qt4_FIND_VERSION )
SET ( QT_MIN_VERSION ${ Qt4_FIND_VERSION } )
SET ( QT_MIN_VERSION ${ Qt4_FIND_VERSION } )
SET ( req_qt_major_vers ${ Qt4_FIND_VERSION_MAJOR } )
SET ( req_qt_major_vers ${ Qt4_FIND_VERSION_MAJOR } )
@ -432,7 +444,6 @@ IF (QT_QMAKE_EXECUTABLE)
MATH ( EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}" )
MATH ( EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}" )
# S u p p o r t f i n d i n g * e x a c t l y * a p a r t i c u l a r v e r s i o n , f o r i n s t a n c e FIND_PACKAGE ( Qt4 4.4.3 EXACT )
# S u p p o r t f i n d i n g * e x a c t l y * a p a r t i c u l a r v e r s i o n , f o r i n s t a n c e FIND_PACKAGE ( Qt4 4.4.3 EXACT )
# T h e ' e l s e ' b r a n c h s h o u l d b e r e m o v e d f o r C M a k e 2 . 8
IF ( Qt4_FIND_VERSION_EXACT )
IF ( Qt4_FIND_VERSION_EXACT )
IF ( found_vers EQUAL req_vers )
IF ( found_vers EQUAL req_vers )
SET ( QT4_QMAKE_FOUND TRUE )
SET ( QT4_QMAKE_FOUND TRUE )
@ -487,38 +498,38 @@ IF (QT4_QMAKE_FOUND)
ENDIF ( APPLE )
ENDIF ( APPLE )
# a s k q m a k e f o r t h e b i n a r y d i r
# a s k q m a k e f o r t h e b i n a r y d i r
IF ( ( QT_LIBRARY_DIR AND NOT QT_BINARY_DIR ) OR QT_QMAKE_CHANGED )
IF ( QT_LIBRARY_DIR AND NOT QT_BINARY_DIR OR QT_QMAKE_CHANGED )
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
A R G S " - q u e r y Q T _ I N S T A L L _ B I N S "
A R G S " - q u e r y Q T _ I N S T A L L _ B I N S "
O U T P U T _ V A R I A B L E q t _ b i n s )
O U T P U T _ V A R I A B L E q t _ b i n s )
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
FILE ( TO_CMAKE_PATH "${qt_bins}" qt_bins )
FILE ( TO_CMAKE_PATH "${qt_bins}" qt_bins )
SET ( QT_BINARY_DIR ${ qt_bins } CACHE INTERNAL "" FORCE )
SET ( QT_BINARY_DIR ${ qt_bins } CACHE INTERNAL "" FORCE )
ENDIF ( ( QT_LIBRARY_DIR AND NOT QT_BINARY_DIR ) OR QT_QMAKE_CHANGED )
ENDIF ( QT_LIBRARY_DIR AND NOT QT_BINARY_DIR OR QT_QMAKE_CHANGED )
# a s k q m a k e f o r t h e i n c l u d e d i r
# a s k q m a k e f o r t h e i n c l u d e d i r
IF ( ( QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR ) OR QT_QMAKE_CHANGED )
IF ( QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR OR QT_QMAKE_CHANGED )
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
A R G S " - q u e r y Q T _ I N S T A L L _ H E A D E R S "
A R G S " - q u e r y Q T _ I N S T A L L _ H E A D E R S "
O U T P U T _ V A R I A B L E q t _ h e a d e r s )
O U T P U T _ V A R I A B L E q t _ h e a d e r s )
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
FILE ( TO_CMAKE_PATH "${qt_headers}" qt_headers )
FILE ( TO_CMAKE_PATH "${qt_headers}" qt_headers )
SET ( QT_HEADERS_DIR ${ qt_headers } CACHE INTERNAL "" FORCE )
SET ( QT_HEADERS_DIR ${ qt_headers } CACHE INTERNAL "" FORCE )
ENDIF ( ( QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR ) OR QT_QMAKE_CHANGED )
ENDIF ( QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR OR QT_QMAKE_CHANGED )
# a s k q m a k e f o r t h e d o c u m e n t a t i o n d i r e c t o r y
# a s k q m a k e f o r t h e d o c u m e n t a t i o n d i r e c t o r y
IF ( ( QT_LIBRARY_DIR AND NOT QT_DOC_DIR ) OR QT_QMAKE_CHANGED )
IF ( QT_LIBRARY_DIR AND NOT QT_DOC_DIR OR QT_QMAKE_CHANGED )
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
A R G S " - q u e r y Q T _ I N S T A L L _ D O C S "
A R G S " - q u e r y Q T _ I N S T A L L _ D O C S "
O U T P U T _ V A R I A B L E q t _ d o c _ d i r )
O U T P U T _ V A R I A B L E q t _ d o c _ d i r )
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
FILE ( TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir )
FILE ( TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir )
SET ( QT_DOC_DIR ${ qt_doc_dir } CACHE PATH "The location of the Qt docs" FORCE )
SET ( QT_DOC_DIR ${ qt_doc_dir } CACHE PATH "The location of the Qt docs" FORCE )
ENDIF ( ( QT_LIBRARY_DIR AND NOT QT_DOC_DIR ) OR QT_QMAKE_CHANGED )
ENDIF ( QT_LIBRARY_DIR AND NOT QT_DOC_DIR OR QT_QMAKE_CHANGED )
# a s k q m a k e f o r t h e m k s p e c s d i r e c t o r y
# a s k q m a k e f o r t h e m k s p e c s d i r e c t o r y
IF ( ( QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR ) OR QT_QMAKE_CHANGED )
IF ( QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR OR QT_QMAKE_CHANGED )
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
A R G S " - q u e r y Q M A K E _ M K S P E C S "
A R G S " - q u e r y Q M A K E _ M K S P E C S "
O U T P U T _ V A R I A B L E q t _ m k s p e c s _ d i r s )
O U T P U T _ V A R I A B L E q t _ m k s p e c s _ d i r s )
@ -531,27 +542,27 @@ IF (QT4_QMAKE_FOUND)
FIND_PATH ( QT_MKSPECS_DIR qconfig.pri PATHS ${ qt_mkspecs_dirs }
FIND_PATH ( QT_MKSPECS_DIR qconfig.pri PATHS ${ qt_mkspecs_dirs }
D O C " T h e l o c a t i o n o f t h e Q t m k s p e c s c o n t a i n i n g q c o n f i g . p r i "
D O C " T h e l o c a t i o n o f t h e Q t m k s p e c s c o n t a i n i n g q c o n f i g . p r i "
N O _ D E F A U L T _ P A T H )
N O _ D E F A U L T _ P A T H )
ENDIF ( ( QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR ) OR QT_QMAKE_CHANGED )
ENDIF ( QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR OR QT_QMAKE_CHANGED )
# a s k q m a k e f o r t h e p l u g i n s d i r e c t o r y
# a s k q m a k e f o r t h e p l u g i n s d i r e c t o r y
IF ( ( QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR ) OR QT_QMAKE_CHANGED )
IF ( QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED )
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
A R G S " - q u e r y Q T _ I N S T A L L _ P L U G I N S "
A R G S " - q u e r y Q T _ I N S T A L L _ P L U G I N S "
O U T P U T _ V A R I A B L E q t _ p l u g i n s _ d i r )
O U T P U T _ V A R I A B L E q t _ p l u g i n s _ d i r )
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
FILE ( TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir )
FILE ( TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir )
SET ( QT_PLUGINS_DIR ${ qt_plugins_dir } CACHE PATH "The location of the Qt plugins" FORCE )
SET ( QT_PLUGINS_DIR ${ qt_plugins_dir } CACHE PATH "The location of the Qt plugins" FORCE )
ENDIF ( ( QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR ) OR QT_QMAKE_CHANGED )
ENDIF ( QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED )
# a s k q m a k e f o r t h e t r a n s l a t i o n s d i r e c t o r y
# a s k q m a k e f o r t h e t r a n s l a t i o n s d i r e c t o r y
IF ( ( QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR ) OR QT_QMAKE_CHANGED )
IF ( QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR OR QT_QMAKE_CHANGED )
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
EXEC_PROGRAM ( ${ QT_QMAKE_EXECUTABLE }
A R G S " - q u e r y Q T _ I N S T A L L _ T R A N S L A T I O N S "
A R G S " - q u e r y Q T _ I N S T A L L _ T R A N S L A T I O N S "
O U T P U T _ V A R I A B L E q t _ t r a n s l a t i o n s _ d i r )
O U T P U T _ V A R I A B L E q t _ t r a n s l a t i o n s _ d i r )
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
# m a k e s u r e w e h a v e / a n d n o t \ a s q m a k e g i v e s o n w i n d o w s
FILE ( TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir )
FILE ( TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir )
SET ( QT_TRANSLATIONS_DIR ${ qt_translations_dir } CACHE PATH "The location of the Qt translations" FORCE )
SET ( QT_TRANSLATIONS_DIR ${ qt_translations_dir } CACHE PATH "The location of the Qt translations" FORCE )
ENDIF ( ( QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR ) OR QT_QMAKE_CHANGED )
ENDIF ( QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR OR QT_QMAKE_CHANGED )
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
#
@ -865,10 +876,13 @@ IF (QT4_QMAKE_FOUND)
_QT4_ADJUST_LIB_VARS ( QTXMLPATTERNS )
_QT4_ADJUST_LIB_VARS ( QTXMLPATTERNS )
_QT4_ADJUST_LIB_VARS ( PHONON )
_QT4_ADJUST_LIB_VARS ( PHONON )
_QT4_ADJUST_LIB_VARS ( QTCLUCENE )
_QT4_ADJUST_LIB_VARS ( QTCLUCENE )
_QT4_ADJUST_LIB_VARS ( QTMOTIF )
_QT4_ADJUST_LIB_VARS ( QTSCRIPTTOOLS )
_QT4_ADJUST_LIB_VARS ( QTSCRIPTTOOLS )
# p l a t f o r m d e p e n d e n t l i b r a r i e s
# p l a t f o r m d e p e n d e n t l i b r a r i e s
IF ( Q_WS_X11 )
_QT4_ADJUST_LIB_VARS ( QTMOTIF )
ENDIF ( Q_WS_X11 )
IF ( WIN32 )
IF ( WIN32 )
_QT4_ADJUST_LIB_VARS ( QTMAIN )
_QT4_ADJUST_LIB_VARS ( QTMAIN )
_QT4_ADJUST_LIB_VARS ( QAXSERVER )
_QT4_ADJUST_LIB_VARS ( QAXSERVER )
@ -1018,7 +1032,12 @@ IF (QT4_QMAKE_FOUND)
GET_DIRECTORY_PROPERTY ( _inc_DIRS INCLUDE_DIRECTORIES )
GET_DIRECTORY_PROPERTY ( _inc_DIRS INCLUDE_DIRECTORIES )
FOREACH ( _current ${ _inc_DIRS } )
FOREACH ( _current ${ _inc_DIRS } )
IF ( "${_current}" MATCHES ".framework/?$" )
STRING ( REGEX REPLACE "/[^/]+.framework" "" framework_path "${_current}" )
SET ( ${ _moc_flags } ${ ${_moc_flags } } "-F${framework_path}" )
ELSE ( "${_current}" MATCHES ".framework/?$" )
SET ( ${ _moc_flags } ${ ${_moc_flags } } "-I${_current}" )
SET ( ${ _moc_flags } ${ ${_moc_flags } } "-I${_current}" )
ENDIF ( "${_current}" MATCHES ".framework/?$" )
ENDFOREACH ( _current ${ _inc_DIRS } )
ENDFOREACH ( _current ${ _inc_DIRS } )
GET_DIRECTORY_PROPERTY ( _defines COMPILE_DEFINITIONS )
GET_DIRECTORY_PROPERTY ( _defines COMPILE_DEFINITIONS )
@ -1067,6 +1086,7 @@ IF (QT4_QMAKE_FOUND)
MACRO ( QT4_GENERATE_MOC infile outfile )
MACRO ( QT4_GENERATE_MOC infile outfile )
# g e t i n c l u d e d i r s a n d f l a g s
QT4_GET_MOC_FLAGS ( moc_flags )
QT4_GET_MOC_FLAGS ( moc_flags )
GET_FILENAME_COMPONENT ( abs_infile ${ infile } ABSOLUTE )
GET_FILENAME_COMPONENT ( abs_infile ${ infile } ABSOLUTE )
QT4_CREATE_MOC_COMMAND ( ${ abs_infile } ${ outfile } "${moc_flags}" "" )
QT4_CREATE_MOC_COMMAND ( ${ abs_infile } ${ outfile } "${moc_flags}" "" )
@ -1174,8 +1194,9 @@ IF (QT4_QMAKE_FOUND)
ENDMACRO ( QT4_ADD_DBUS_INTERFACES )
ENDMACRO ( QT4_ADD_DBUS_INTERFACES )
MACRO ( QT4_GENERATE_DBUS_INTERFACE _header ) # _ c u s t o m N a m e )
MACRO ( QT4_GENERATE_DBUS_INTERFACE _header ) # _ c u s t o m N a m e O P T I O N S - s o m e - o p t i o n s )
SET ( _customName "${ARGV1}" )
QT4_EXTRACT_OPTIONS ( _customName _qt4_dbus_options ${ ARGN } )
GET_FILENAME_COMPONENT ( _in_file ${ _header } ABSOLUTE )
GET_FILENAME_COMPONENT ( _in_file ${ _header } ABSOLUTE )
GET_FILENAME_COMPONENT ( _basename ${ _header } NAME_WE )
GET_FILENAME_COMPONENT ( _basename ${ _header } NAME_WE )
@ -1186,13 +1207,13 @@ IF (QT4_QMAKE_FOUND)
ENDIF ( _customName )
ENDIF ( _customName )
ADD_CUSTOM_COMMAND ( OUTPUT ${ _target }
ADD_CUSTOM_COMMAND ( OUTPUT ${ _target }
C O M M A N D $ { Q T _ D B U S C P P 2 X M L _ E X E C U T A B L E } -o $ { _ t a r g e t } $ { _ i n _ f i l e }
C O M M A N D $ { Q T _ D B U S C P P 2 X M L _ E X E C U T A B L E } ${ _ q t 4 _ d b u s _ o p t i o n s } $ { _ i n _ f i l e } - o $ { _ t a r g e t }
D E P E N D S $ { _ i n _ f i l e }
D E P E N D S $ { _ i n _ f i l e }
)
)
ENDMACRO ( QT4_GENERATE_DBUS_INTERFACE )
ENDMACRO ( QT4_GENERATE_DBUS_INTERFACE )
MACRO ( QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass ) # _ o p t i o n a l B a s e n a m e
MACRO ( QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass ) # _ o p t i o n a l B a s e n a m e _o p t i o n a l C l a s s N a m e )
GET_FILENAME_COMPONENT ( _infile ${ _xml_file } ABSOLUTE )
GET_FILENAME_COMPONENT ( _infile ${ _xml_file } ABSOLUTE )
SET ( _optionalBasename "${ARGV4}" )
SET ( _optionalBasename "${ARGV4}" )
@ -1253,6 +1274,7 @@ IF (QT4_QMAKE_FOUND)
IF ( _match )
IF ( _match )
FOREACH ( _current_MOC_INC ${ _match } )
FOREACH ( _current_MOC_INC ${ _match } )
STRING ( REGEX MATCH "[^ <\" ]+\\.moc " _current_MOC " ${ _current_MOC_INC } " )
STRING ( REGEX MATCH "[^ <\" ]+\\.moc " _current_MOC " ${ _current_MOC_INC } " )
GET_FILENAME_COMPONENT ( _basename ${ _current_MOC } NAME_WE )
GET_FILENAME_COMPONENT ( _basename ${ _current_MOC } NAME_WE )
IF ( EXISTS ${ _abs_PATH } / ${ _basename } .hpp )
IF ( EXISTS ${ _abs_PATH } / ${ _basename } .hpp )
SET ( _header ${ _abs_PATH } / ${ _basename } .hpp )
SET ( _header ${ _abs_PATH } / ${ _basename } .hpp )
@ -1343,7 +1365,7 @@ IF (QT4_QMAKE_FOUND)
Q T _ U I C _ E X E C U T A B L E A N D Q T _ R C C _ E X E C U T A B L E A N D Q T _ Q T C O R E _ L I B R A R Y )
Q T _ U I C _ E X E C U T A B L E A N D Q T _ R C C _ E X E C U T A B L E A N D Q T _ Q T C O R E _ L I B R A R Y )
SET ( QT4_FOUND "YES" )
SET ( QT4_FOUND "YES" )
INCLUDE ( FindPackageMessage )
INCLUDE ( FindPackageMessage )
FIND_PACKAGE_MESSAGE ( Qt4 "Found Qt-Version ${QTVERSION} "
FIND_PACKAGE_MESSAGE ( Qt4 "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE}) "
" [ $ { Q T _ L I B R A R Y _ D I R } ] [ $ { Q T _ I N C L U D E _ D I R } ] [ $ { Q T _ M O C _ E X E C U T A B L E } ] [ $ { Q T _ U I C _ E X E C U T A B L E } ] [ $ { Q T _ R C C _ E X E C U T A B L E } ] " )
" [ $ { Q T _ L I B R A R Y _ D I R } ] [ $ { Q T _ I N C L U D E _ D I R } ] [ $ { Q T _ M O C _ E X E C U T A B L E } ] [ $ { Q T _ U I C _ E X E C U T A B L E } ] [ $ { Q T _ R C C _ E X E C U T A B L E } ] " )
ELSE ( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
ELSE ( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
Q T _ U I C _ E X E C U T A B L E A N D Q T _ R C C _ E X E C U T A B L E A N D Q T _ Q T C O R E _ L I B R A R Y )
Q T _ U I C _ E X E C U T A B L E A N D Q T _ R C C _ E X E C U T A B L E A N D Q T _ Q T C O R E _ L I B R A R Y )
@ -1497,12 +1519,21 @@ IF (QT4_QMAKE_FOUND)
ENDIF ( QT_QCONFIG MATCHES "system-zlib" )
ENDIF ( QT_QCONFIG MATCHES "system-zlib" )
# # o p e n s s l
# # o p e n s s l
IF ( QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN )
IF ( NOT Q_WS_WIN )
SET ( _QT_NEED_OPENSSL 0 )
IF ( QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl" )
SET ( _QT_NEED_OPENSSL 1 )
ENDIF ( QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl" )
IF ( QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked" )
SET ( _QT_NEED_OPENSSL 1 )
ENDIF ( QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked" )
IF ( _QT_NEED_OPENSSL )
FIND_PACKAGE ( OpenSSL )
FIND_PACKAGE ( OpenSSL )
IF ( OPENSSL_LIBRARIES )
IF ( OPENSSL_LIBRARIES )
SET ( QT_QTNETWORK_LIB_DEPENDENCIES ${ QT_QTNETWORK_LIB_DEPENDENCIES } ${ OPENSSL_LIBRARIES } )
SET ( QT_QTNETWORK_LIB_DEPENDENCIES ${ QT_QTNETWORK_LIB_DEPENDENCIES } ${ OPENSSL_LIBRARIES } )
ENDIF ( OPENSSL_LIBRARIES )
ENDIF ( OPENSSL_LIBRARIES )
ENDIF ( QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN )
ENDIF ( _QT_NEED_OPENSSL )
ENDIF ( NOT Q_WS_WIN )
# # d b u s
# # d b u s
IF ( QT_QCONFIG MATCHES "dbus" )
IF ( QT_QCONFIG MATCHES "dbus" )
Modestas Vainius
15 years ago