An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 29d3bae1 authored by jcfr's avatar jcfr
Browse files

COMP: SlicerQT - Slicer3_USE_QT is now define using #cmakedefine...

COMP: SlicerQT - Slicer3_USE_QT is now define using #cmakedefine Slicer3_USE_QT in vtkSlicerConfigure.h.in

Note: It was previously defined using ADD_DEFINITIONS(-DSlicer3_USE_QT) in CMake/Slicer3FindQT.cmake

git-svn-id: http://svn.slicer.org/Slicer4/trunk@11601 3bd1e089-480b-0410-8dfb-8563597acbee
parent 9dec37eb
......@@ -12,6 +12,8 @@
==========================================================================*/
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
//---------------------------------------------------------------------------
// Slicer3_USE_QT
//
......@@ -35,6 +37,7 @@
#include "vtkKWTkUtilities.h"
#include "vtkKWResourceUtilities.h"
#include "vtkKWSplashScreen.h"
#include "vtkSlicerLogoIcons.h"
#include "vtkSlicerApplication.h"
#include "vtkSlicerApplicationLogic.h"
......@@ -43,19 +46,24 @@
#include "vtkSlicerModelHierarchyLogic.h"
#include "vtkSlicerFiducialsLogic.h"
#include "vtkSlicerColorLogic.h"
#include "vtkMRMLScene.h"
#include "vtkMRMLCrosshairNode.h"
#include "vtkCacheManager.h"
#include "vtkDataIOManager.h"
#include "vtkDataIOManagerLogic.h"
#include "vtkSlicerCacheAndDataIOManagerGUI.h"
#include "vtkSlicerComponentGUI.h"
#include "vtkSlicerApplicationGUI.h"
#include "vtkSlicerSlicesGUI.h"
#include "vtkKWUserInterfacePanel.h"
#include "vtkKWUserInterfaceManager.h"
#include "vtkKWUserInterfaceManagerNotebook.h"
#include "vtkKWLogDialog.h"
#include "vtkSlicerGUICollection.h"
#include "vtkSlicerModelsGUI.h"
#include "vtkSlicerFiducialsGUI.h"
......@@ -67,8 +75,6 @@
#include "vtkSlicerWindow.h"
#include "vtkSlicerApplicationSettingsInterface.h"
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
#include "ModuleFactory.h"
#include "vtkSlicerROILogic.h"
......
#include "vtkSlicerConfigure.h" // Slicer3_USE_*
//
// SlicerQT
//
#ifdef Slicer3_USE_QT
# ifdef Slicer3_USE_PYTHONQT
# include "PythonQt.h"
# include "PythonQt_QtAll.h"
# endif
// qSlicer includes
#include "qSlicerApplication.h"
#include "qSlicerAbstractModule.h"
#include "qSlicerModuleManager.h"
#include "qSlicerModuleFactory.h"
#include "qSlicerModulePanel.h"
//#include "QtSlicerWebKit.h"
// QT includes
#include <QHash>
#include <QDebug>
#include <QStringList>
#endif
#include <sstream>
#include <vtksys/stl/string>
#include <vtksys/SystemTools.hxx>
#include "vtkObjectFactory.h"
// vtkSlicer includes
#include "vtkSlicerApplication.h"
#include "vtkSlicerGUICollection.h"
#include "vtkSlicerModuleGUI.h"
#include "vtkSlicerGUILayout.h"
#include "vtkSlicerGUICollection.h"
#include "vtkSlicerColorGUI.h"
#include "vtkSlicerTheme.h"
#include "vtkSlicerFont.h"
// KWWidget includes
#include "vtkKWNotebook.h"
#include "vtkKWFrame.h"
#include "vtkKWUserInterfacePanel.h"
......@@ -37,35 +48,38 @@
#include "vtkKWSplashScreen.h"
#include "vtkKWSplitFrame.h"
#include "vtkKWDirectoryPresetSelector.h"
#include "vtkSlicerBaseGUIWin32Header.h"
#include "vtkKWMessageDialog.h"
#include "vtkKWRegistryHelper.h"
#include "vtkSlicerGUILayout.h"
#include "vtkMRMLScene.h"
#include "vtkMRMLLayoutNode.h"
#include "vtkSlicerGUICollection.h"
#include "vtkSlicerTheme.h"
#include "vtkSlicerFont.h"
#include "vtkOutputWindow.h"
#include "itkOutputWindow.h"
#ifdef WIN32
#include "vtkKWWin32RegistryHelper.h"
# include "vtkKWWin32RegistryHelper.h"
#endif
#ifndef _WIN32
#include <unistd.h>
#endif
// VTK includes
#include "vtkObjectFactory.h"
#include "vtkOutputWindow.h"
// ITK includes
#include "itkOutputWindow.h"
#include "itksys/SystemTools.hxx"
// MRML includes
#include "vtkMRMLScene.h"
#include "vtkMRMLLayoutNode.h"
// STL includes
#include <sstream>
#include <queue>
#include <algorithm>
#include "vtkKWMessageDialog.h"
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
// VTKSYS includes
#include <vtksys/stl/string>
#include <vtksys/SystemTools.hxx>
#include "vtkSlicerColorGUI.h"
#ifndef _WIN32
# include <unistd.h>
#endif
#include "vtkSlicerBaseGUIWin32Header.h"
#ifdef Slicer3_USE_PYTHON
#include "slicerPython.h"
......
......@@ -13,6 +13,7 @@
=========================================================================auto=*/
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
#ifdef Slicer3_USE_QT
#include "qSlicerApplication.h"
......@@ -24,11 +25,14 @@
#endif
// STL includes
#include <sstream>
#include <string>
#include <vtksys/SystemTools.hxx>
#include <itksys/SystemTools.hxx>
// VTK includes
#include "vtkCommand.h"
#include "vtkCornerAnnotation.h"
#include "vtkObjectFactory.h"
......@@ -41,6 +45,7 @@
#include "vtkPolyDataMapper.h"
#include "vtkRenderWindow.h"
// KWWidget includes
#include "vtkKWApplication.h"
#include "vtkKWTclInteractor.h"
#include "vtkKWWidget.h"
......@@ -63,6 +68,7 @@
#include "vtkKWEvent.h"
#include "vtkKWTkUtilities.h"
// vtkSlicer includes
#include "vtkSlicerWindow.h"
#include "vtkSlicerApplication.h"
#include "vtkSlicerApplicationGUI.h"
......@@ -83,11 +89,10 @@
#include "vtkSlicerFiducialListWidget.h"
#include "vtkSlicerROIViewerWidget.h"
// MRML includes
#include "vtkMRMLScene.h"
#include "vtkMRMLViewNode.h"
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
#ifdef Slicer3_USE_PYTHON
#include "slicerPython.h"
#endif
......
......@@ -15,7 +15,6 @@ IF(Slicer3_USE_QT)
SET(QT_USE_QTNETWORK ON)
INCLUDE(${QT_USE_FILE})
SET(Slicer3_USE_QT ON)
ADD_DEFINITIONS(-DSlicer3_USE_QT)
ELSE(QT4_FOUND)
MESSAGE("Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
ENDIF(QT4_FOUND)
......
......@@ -26,6 +26,7 @@
#cmakedefine Slicer3_USE_NUMPY
#cmakedefine Slicer3_USE_PYTHON
#cmakedefine Slicer3_USE_OPENTRACKER
#cmakedefine Slicer3_USE_QT
#define VTKSLICER_CONFIGURATION_TYPES "@CMAKE_CONFIGURATION_TYPES@"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment