From: Frederic Cervenansky Date: Wed, 20 Oct 2010 08:32:39 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: Creatools2-0-3.creaImageIO0-2-5.17Feb2011~21 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1828180a7169f3de7297ba87fb564b99832b7a43;p=creaImageIO.git *** empty log message *** --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 618ca30..9ae8fc6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,16 +14,14 @@ FILE(GLOB SOURCES_CREAIMAGEIO # settings creaImageIOSettings.cpp - - BlockScopeWxApp.cpp - creaImageIOGimmickReaderDialog.cpp - creaImageIOExternalGimmick.cpp - # Viewer - creaImageIOWxViewer.cpp creaImageIOGimmickView.cpp - creaImageIOListener.cpp ) - +IF(USE_WXWIDGETS) + FILE(GLOB SOURCES_CREAIMAGEIO_DIALOG + creaImageIOGimmickReaderDialog.cpp + ) + SOURCE_GROUP("Source Files\\Reader Dialog" FILES ${SOURCES_CREAIMAGEIO_DIALOG}) +ENDIF(USE_WXWIDGETS) # Attributed tree data structure FILE(GLOB SOURCES_CREAIMAGEIO_TREE creaImageIOTree.cpp @@ -78,7 +76,12 @@ FILE(GLOB SOURCES_CREAIMAGEIO_WX creaImageIOWxPACSConnectionPanel.cpp creaImageIOWxTreeView.cpp creaImageIOWxOutputDlg.cpp - ) + # Viewer + creaImageIOWxViewer.cpp + creaImageIOExternalGimmick.cpp + BlockScopeWxApp.cpp + creaImageIOListener.cpp + ) SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX}) endif() @@ -92,7 +95,7 @@ IF (USE_QT4) # headers SET(QT4_HEADERS_TO_WRAP QtGUI/creaimageioqtreeview.h - QtGUI/mainwindow.h + QtGUI/creaImageIOQTGimmickReaderDialog.h ) @@ -141,6 +144,7 @@ SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE}) IF(USE_WXWIDGETS) SET( GUI_SRCS ${SOURCES_CREAIMAGEIO_WX} + ${SOURCES_CREAIMAGEIO_DIALOG} ) ELSE(USE_WXWIDGETS) SET( GUI_SRCS