From: Eduardo Davila Date: Tue, 14 Apr 2009 17:14:15 +0000 (+0000) Subject: BUG INSTALL *.txx X-Git-Tag: EED.02Oct2009~62 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e80ce266f593f105b14c3cb7d71bac6ba6c3f4e1;p=bbtk.git BUG INSTALL *.txx --- diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index f9ee9f8..48e2b36 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -126,7 +126,7 @@ CREA_DEFINE(BBTK_EXPORT_SYMBOLS) # Sources files FILE(GLOB SOURCES "." "*.cxx" "*.cpp") # "ThirdParty/wx/treemultictrl/*.cpp") -FILE(GLOB SOURCES_H "." "*.h" ) +FILE(GLOB SOURCES_H "." "*.h" "*.txx" ) #----------------------------------------------------------------------------- IF(BBTK_USE_KWWIDGETS) @@ -140,18 +140,20 @@ ENDIF(BBTK_USE_KWWIDGETS) #----------------------------------------------------------------------------- IF(BBTK_USE_QT) - #--------------------------------------------------------------------------- - # MOC - SET(QT4_HEADERS_TO_WRAP - bbtkQtBlackBoxDialog.h - ) - QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP}) - #--------------------------------------------------------------------------- - # UI - QT4_WRAP_UI(UI_SOURCES - bbtkQtBlackBoxDialog.ui - ) - SET(SOURCES ${SOURCES} ${MOC_SOURCES} ${UI_SOURCES}) + IF(QT_FOUND) + #--------------------------------------------------------------------------- + # MOC + SET(QT4_HEADERS_TO_WRAP + bbtkQtBlackBoxDialog.h + ) + QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP}) + #--------------------------------------------------------------------------- + # UI + QT4_WRAP_UI(UI_SOURCES + bbtkQtBlackBoxDialog.ui + ) + SET(SOURCES ${SOURCES} ${MOC_SOURCES} ${UI_SOURCES}) + ENDIF(QT_FOUND) ENDIF(BBTK_USE_QT) #----------------------------------------------------------------------------- @@ -192,7 +194,7 @@ ENDIF(UNIX) #----------------------------------------------------------------------------- -FILE(GLOB BBTK_HEADERS "*.h") +FILE(GLOB BBTK_HEADERS "*.h" "*.txx") INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk) INSTALL(TARGETS bbtk DESTINATION ${BBTK_LIB_PATH}) #-----------------------------------------------------------------------------