Commit e1c20477 authored by Otmane Lahlou's avatar Otmane Lahlou

REFAC: move applications classes to dedicated directory

parent 9a7d16ca
#############################################################################
# Source files of Common library
# Package GUI (files ordered by lexicographical order i.e. ease of search).
set( Common_Gui_SOURCES
mvdApplicationsBrowser.cxx
mvdApplicationsToolBox.cxx
mvdApplicationLauncher.cxx
)
#############################################################################
# Qt's MOC header files for Common library (QObject derived classes).
# Package GUI (files ordered by lexicographical order i.e. ease of search).
set( Common_ApplicationsWrapper_HEADERS_MOC
mvdApplicationsBrowser.h
mvdApplicationsToolBox.h
mvdApplicationLauncher.h
)
#############################################################################
# Qt designer UI files
set( Common_ApplicationsWrapper_FORMS
mvdApplicationsToolBox.ui
)
# Qt resources
set( Common_ApplicationsWrapper_RESOURCES
)
include_directories(
${Monteverdi2_BINARY_DIR}
#
${Monteverdi2_SOURCE_DIR}/Code/Common
#
${Monteverdi2_BINARY_DIR}/Code/Common
#
${OTB_SOURCE_DIR}/Code/Wrappers/QtWidget
)
#############################################################################
# Qt4 wrapped files.
qt4_wrap_cpp( Common_ApplicationsWrapper_SRC_MOC ${Common_ApplicationsWrapper_HEADERS_MOC} )
qt4_wrap_ui( Common_ApplicationsWrapper_FORMS_HEADERS ${Common_ApplicationsWrapper_FORMS} )
qt4_add_resources( Common_ApplicationsWrapper_RESOURCES_RCC ${Common_ApplicationsWrapper_RESOURCES} )
########################################################################
# Qt4 translations.
# Sources files to translate.
add_to_qt4_i18n_sources(
${Common_ApplicationsWrapper_SOURCES}
${Common_ApplicationsWrapper_HEADERS_MOC}
${Common_ApplicationsWrapper_FORMS}
)
#############################################################################
add_library(Monteverdi2_ApplicationsWrapper
${Common_ApplicationsWrapper_SOURCES}
${Common_ApplicationsWrapper_FORMS_HEADERS}
${Common_ApplicationsWrapper_SRC_MOC}
${Common_ApplicationsWrapper_RESOURCES_RCC}
)
#############################################################################
target_link_libraries(Monteverdi2_ApplicationsWrapper
#Monteverdi2_Core
OTBApplicationEngine
OTBWrapperQtWidget
${OPENGL_LIBRARIES}
#Qt4::QtCore
Qt4::QtGui
Qt4::QtOpenGL
)
set_target_properties(Monteverdi2_ApplicationsWrapper
PROPERTIES ${Monteverdi2_LIBRARY_PROPERTIES}
)
#############################################################################
# INSTALL Common application.
install(
TARGETS Monteverdi2_ApplicationsWrapper
RUNTIME DESTINATION ${Monteverdi2_INSTALL_BIN_DIR} COMPONENT Runtime
LIBRARY DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT Runtime
ARCHIVE DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT Development
)
#############################################################################
......@@ -2,3 +2,8 @@
# Sub-directory entries
add_subdirectory( Core )
add_subdirectory( Gui )
if (OTB_WRAP_QT)
message("-- Generating Qt Wrapped Applications.")
add_subdirectory(ApplicationsWrapper)
endif()
......@@ -16,7 +16,6 @@ set( Common_Core_SOURCES
mvdSystemError.cxx
mvdTypes.cxx
mvdVectorImageModel.cxx
mvdApplicationLauncher.cxx
)
#############################################################################
......@@ -37,7 +36,6 @@ set( Common_Core_HEADERS_MOC
mvdSystemError.h
mvdTypes.h
mvdVectorImageModel.h
mvdApplicationLauncher.h
)
#############################################################################
......@@ -48,8 +46,6 @@ include_directories(
${Monteverdi2_SOURCE_DIR}/Code/Common
#
${Monteverdi2_BINARY_DIR}/Code/Common
#
${OTB_SOURCE_DIR}/Code/Wrappers/QtWidget
)
#############################################################################
......@@ -73,8 +69,6 @@ add_library(Monteverdi2_Core
#############################################################################
target_link_libraries(Monteverdi2_Core
OTBIO
OTBApplicationEngine
OTBWrapperQtWidget
Qt4::QtCore
Qt4::QtXml
)
......
......@@ -7,8 +7,6 @@ set( Common_Gui_SOURCES
mvdAbstractModelController.cxx
#mvdAbstractModelRenderer.cxx
mvdAbstractViewManipulator.cxx
mvdApplicationsBrowser.cxx
mvdApplicationsToolBox.cxx
mvdColorBandDynamicsWidget.cxx
mvdColorDynamicsController.cxx
mvdColorDynamicsWidget.cxx
......@@ -34,8 +32,6 @@ set( Common_Gui_HEADERS_MOC
mvdAbstractModelController.h
mvdAbstractModelRenderer.h
mvdAbstractViewManipulator.h
mvdApplicationsBrowser.h
mvdApplicationsToolBox.h
mvdColorBandDynamicsWidget.h
mvdColorDynamicsController.h
mvdColorDynamicsWidget.h
......@@ -63,7 +59,6 @@ set( Common_Gui_FORMS
mvdMyWidget.ui
mvdStatusBarWidget.ui
mvdVideoColorToolBox.ui
mvdApplicationsToolBox.ui
)
# Qt resources
......@@ -105,7 +100,6 @@ add_library(Monteverdi2_Gui
#############################################################################
target_link_libraries(Monteverdi2_Gui
Monteverdi2_Core
OTBApplicationEngine
${OPENGL_LIBRARIES}
#Qt4::QtCore
Qt4::QtGui
......
......@@ -46,7 +46,11 @@ add_test(apTvMonteverdi2FillToolBoxTree ${Common_TESTS}
add_executable(mvdCommonTests mvdCommonTests.cxx ${Common_SRCS})
target_link_libraries(mvdCommonTests Monteverdi2_Gui Monteverdi2_Core OTBTesting)
target_link_libraries(mvdCommonTests
Monteverdi2_Gui
Monteverdi2_Core
Monteverdi2_ApplicationsWrapper
OTBTesting)
......
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