Commit e9b8bf87 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Issue #44: Updated CMake files do remove Qt dependency from core and modules.

parent 3acfe9a9
......@@ -52,20 +52,12 @@ ENDFOREACH()
# application/campvispainter.h
#)
#
# Qt related stuff:
#
# TODO: remove Qt stuff here!
FIND_PACKAGE(Qt4 ${CampvisRequiredQtVersion} REQUIRED QtCore QtGui QtOpenGL)
INCLUDE(${QT_USE_FILE})
ADD_LIBRARY(campvis-core
${CampvisCoreSources} ${CampvisCoreHeaders}
)
ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${QT_DEFINITIONS})
ADD_DEFINITIONS(${CampvisGlobalDefinitions})
INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs})
TARGET_LINK_LIBRARIES(campvis-core tgt ${CampvisGlobalExternalLibs} ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(campvis-core tgt ${CampvisGlobalExternalLibs})
IF(CAMPVIS_GROUP_SOURCE_FILES)
......
......@@ -29,7 +29,7 @@
#include "imagerepresentationlocal.h"
#include "tgt/qt/qtcontextmanager.h"
#include "tgt/glcontextmanager.h"
#include <tbb/tbb.h>
#include <tbb/spin_mutex.h>
#include "core/datastructures/imagerepresentationdisk.h"
......
......@@ -19,14 +19,9 @@ ADD_LIBRARY(campvis-modules
${CampvisModulesSources} ${CampvisModulesHeaders}
)
# TODO: Remove Qt dependency as soon as the pipelines got cleaned up (and thus removed their hard link to tgt/qt/qtcontextmanager.h
FIND_PACKAGE(Qt4 ${CampvisRequiredQtVersion} REQUIRED QtCore QtGui QtOpenGL)
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions} ${QT_DEFINITIONS})
ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions})
INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs})
TARGET_LINK_LIBRARIES(campvis-modules campvis-core tgt ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(campvis-modules campvis-core tgt ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs})
IF(CAMPVIS_GROUP_SOURCE_FILES)
DEFINE_SOURCE_GROUPS_FROM_SUBDIR(CampvisModulesSources ${CampvisHome} "")
......
......@@ -30,7 +30,6 @@
#include "ixpvdemo.h"
#include "tgt/event/keyevent.h"
#include "tgt/qt/qtcontextmanager.h"
#include "core/datastructures/imagedata.h"
#include "core/classification/geometry1dtransferfunction.h"
......
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