From: Eduardo Davila Date: Thu, 9 Jun 2011 07:39:45 +0000 (+0000) Subject: no message X-Git-Tag: v1.0.4~103 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9a82a8ea2f5e17b47aa4d669af2dc2440f46ff8a;p=creaMaracasVisu.git no message --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 525618d..e947cb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,11 +37,13 @@ SET(USE_WXWIDGETS ON) SET(USE_VTK ON) SET(USE_ITK ON) SET(USE_BOOST ON) -SET(USE_QT4 ON) -IF(USE_QT4) - SET(QT_USE_QTUITOOLS ON) -ENDIF(USE_QT4) +OPTION(QT_USE_QTUITOOLS "QT_USE_QTUITOOLS" OFF) +IF(QT_USE_QTUITOOLS) + SET(USE_QT4 ON) +ELSE(QT_USE_QTUITOOLS) + SET(USE_QT4 OFF) +ENDIF(QT_USE_QTUITOOLS) OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF) diff --git a/lib/GUI/CMakeLists.txt b/lib/GUI/CMakeLists.txt index 01868ac..98e9e7e 100644 --- a/lib/GUI/CMakeLists.txt +++ b/lib/GUI/CMakeLists.txt @@ -1,5 +1,10 @@ # Add a ADD_SUBDIRECTORY command for each of your libraries -ADD_SUBDIRECTORY(Qt) + + +IF(QT_USE_QTUITOOLS) + ADD_SUBDIRECTORY(Qt) +ENDIF(QT_USE_QTUITOOLS) + ADD_SUBDIRECTORY(Wx) ADD_SUBDIRECTORY(Base)