Commit 6e1f52cb authored by jcfr's avatar jcfr

COMP: Require XML and WEBKIT Qt modules and rely on QT_LIBARIES/QT_INCLUDE_DIRS set in UseQt4.cmake

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16715 3bd1e089-480b-0410-8dfb-8563597acbee
parent 991d187f
......@@ -81,16 +81,8 @@ MACRO(SlicerMacroBuildBaseQtLibrary)
# --------------------------------------------------------------------------
# Include dirs
# --------------------------------------------------------------------------
SET(QT_INCLUDE_DIRS
${QT_INCLUDE_DIR}
${QT_QTWEBKIT_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTXML_INCLUDE_DIR}
)
SET(include_dirs
${QT_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${SlicerBaseLogic_SOURCE_DIR}
......@@ -173,12 +165,6 @@ MACRO(SlicerMacroBuildBaseQtLibrary)
SET_TARGET_PROPERTIES(${lib_name} PROPERTIES ${Slicer_LIBRARY_PROPERTIES})
ENDIF()
SET(QT_LIBRARIES
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
)
TARGET_LINK_LIBRARIES(${lib_name}
${QT_LIBRARIES}
${CTK_EXTERNAL_LIBRARIES}
......
......@@ -197,7 +197,7 @@ SET(Slicer_BUNDLE_LOCATION ".")
#-----------------------------------------------------------------------------
# Module name should be specified as they appear in FindQt4.cmake
# For example, the module name associated with the variable QT_USE_QTXML is XML.
SET(Slicer_REQUIRED_QT_MODULES CORE GUI NETWORK)
SET(Slicer_REQUIRED_QT_MODULES CORE GUI NETWORK XML WEBKIT)
IF(BUILD_TESTING)
LIST(APPEND Slicer_REQUIRED_QT_MODULES TEST)
ENDIF()
......
......@@ -252,15 +252,6 @@ SET(include_dirs
${MRMLDisplayableManager_SOURCE_DIR}
${MRMLDisplayableManager_BINARY_DIR}
)
SET(QT_INCLUDE_DIRS
${QT_INCLUDE_DIR}
${QT_QTWEBKIT_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTXML_INCLUDE_DIR}
)
SET(include_dirs ${include_dirs} ${QT_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${include_dirs})
# --------------------------------------------------------------------------
......
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