Commit 42c167cf authored by Antoine Regimbeau's avatar Antoine Regimbeau

REFAC: change cmake module name QT5 to QT

parent c4bb187d
...@@ -535,7 +535,7 @@ endforeach() ...@@ -535,7 +535,7 @@ endforeach()
# message("OTB_MODULES_ENABLED = ${modules_list_for_summary}") # message("OTB_MODULES_ENABLED = ${modules_list_for_summary}")
# unset(modules_list_for_summary) # unset(modules_list_for_summary)
list(REMOVE_ITEM option_list "OTB_USE_6S" "OTB_USE_SIFTFAST" "OTB_USE_QT4") list(REMOVE_ITEM option_list "OTB_USE_6S" "OTB_USE_SIFTFAST" "OTB_USE_QT")
foreach(item ${option_list}) foreach(item ${option_list})
if(NOT ${item}) if(NOT ${item})
list(REMOVE_ITEM option_list "${item}" ) list(REMOVE_ITEM option_list "${item}" )
...@@ -554,7 +554,7 @@ list(APPEND option_list TINYXML) ...@@ -554,7 +554,7 @@ list(APPEND option_list TINYXML)
#Q: Why these two guys here? we already have option_list #Q: Why these two guys here? we already have option_list
#A: Because cmake case sensitivity with variables. #A: Because cmake case sensitivity with variables.
if(OTB_USE_QT4) if(OTB_USE_QT)
list(APPEND option_list QT) list(APPEND option_list QT)
endif() endif()
#sort again! #sort again!
......
...@@ -22,6 +22,6 @@ set( DOCUMENTATION "Adapters for the Qt Library.") ...@@ -22,6 +22,6 @@ set( DOCUMENTATION "Adapters for the Qt Library.")
otb_module( OTBQtAdapters otb_module( OTBQtAdapters
ENABLE_SHARED ENABLE_SHARED
DEPENDS OTBQt5 DEPENDS OTBQt
DESCRIPTION "${DOCUMENTATION}" DESCRIPTION "${DOCUMENTATION}"
) )
...@@ -34,7 +34,7 @@ qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} ) ...@@ -34,7 +34,7 @@ qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} )
add_library( OTBQtAdapters ${OTBQtAdapters_SRC} ${OTBQtAdapters_SRC_MOC}) add_library( OTBQtAdapters ${OTBQtAdapters_SRC} ${OTBQtAdapters_SRC_MOC})
target_link_libraries( OTBQtAdapters target_link_libraries( OTBQtAdapters
${OTBQt5_LIBRARIES} ${OTBQt_LIBRARIES}
) )
otb_module_target( OTBQtAdapters ) otb_module_target( OTBQtAdapters )
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
# limitations under the License. # limitations under the License.
# #
project( OTBQt5 ) project( OTBQt )
set( OTBQt5_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5OpenGL_LIBRARIES}) set( OTBQt_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5OpenGL_LIBRARIES})
set( QT_VERSION "${QTVERSION}" CACHE INTERNAL "" FORCE ) set( QT_VERSION "${QTVERSION}" CACHE INTERNAL "" FORCE )
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
set(DOCUMENTATION "This module imports Qt5 to the build system") set(DOCUMENTATION "This module imports Qt5 to the build system")
otb_module(OTBQt5 otb_module(OTBQt
DEPENDS DEPENDS
TEST_DEPENDS TEST_DEPENDS
......
...@@ -22,7 +22,7 @@ set(DOCUMENTATION "This module imports Qwt to the build system") ...@@ -22,7 +22,7 @@ set(DOCUMENTATION "This module imports Qwt to the build system")
otb_module(OTBQwt otb_module(OTBQwt
DEPENDS DEPENDS
OTBQt5 OTBQt
TEST_DEPENDS TEST_DEPENDS
......
...@@ -190,7 +190,7 @@ private: ...@@ -190,7 +190,7 @@ private:
*/ */
Ui::MaplaMainWindow* m_UI; Ui::MaplaMainWindow* m_UI;
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
/** /**
* \brief OTB-applications tool-box controller. * \brief OTB-applications tool-box controller.
*/ */
......
...@@ -27,7 +27,7 @@ otb_module( OTBMapla ...@@ -27,7 +27,7 @@ otb_module( OTBMapla
DEPENDS DEPENDS
OTBMonteverdiCore OTBMonteverdiCore
OTBMonteverdiGUI OTBMonteverdiGUI
OTBQt5 OTBQt
OPTIONAL_DEPENDS OPTIONAL_DEPENDS
......
...@@ -79,7 +79,7 @@ add_library( OTBMapla ...@@ -79,7 +79,7 @@ add_library( OTBMapla
target_link_libraries( OTBMapla target_link_libraries( OTBMapla
${OTBMonteverdiCore_LIBRARIES} ${OTBMonteverdiCore_LIBRARIES}
${OTBMonteverdiGUI_LIBRARIES} ${OTBMonteverdiGUI_LIBRARIES}
${OTBQt5_LIBRARIES} ${OTBQt_LIBRARIES}
) )
otb_module_target( OTBMapla ) otb_module_target( OTBMapla )
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// Monteverdi includes (sorted by alphabetic order) // Monteverdi includes (sorted by alphabetic order)
// //
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
#include "mvdOTBApplicationsModel.h" #include "mvdOTBApplicationsModel.h"
#endif #endif
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
// //
// Monteverdi includes (sorted by alphabetic order) // Monteverdi includes (sorted by alphabetic order)
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
# include "mvdApplicationLauncher.h" # include "mvdApplicationLauncher.h"
# include "mvdApplicationsToolBoxController.h" # include "mvdApplicationsToolBoxController.h"
# include "mvdOTBApplicationsModel.h" # include "mvdOTBApplicationsModel.h"
...@@ -86,7 +86,7 @@ MaplaMainWindow ...@@ -86,7 +86,7 @@ MaplaMainWindow
::MaplaMainWindow( QWidget * p, Qt::WindowFlags flags ) : ::MaplaMainWindow( QWidget * p, Qt::WindowFlags flags ) :
I18nMainWindow( p, flags ), I18nMainWindow( p, flags ),
m_UI( new mvd::Ui::MaplaMainWindow() ) m_UI( new mvd::Ui::MaplaMainWindow() )
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
, ,
m_ApplicationsToolBoxController( NULL ) m_ApplicationsToolBoxController( NULL )
#endif #endif
...@@ -110,7 +110,7 @@ MaplaMainWindow ...@@ -110,7 +110,7 @@ MaplaMainWindow
setObjectName( "Mapla" ); setObjectName( "Mapla" );
setWindowTitle( PROJECT_NAME " Application Launcher" ); setWindowTitle( PROJECT_NAME " Application Launcher" );
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
assert( m_ApplicationsToolBoxController==NULL ); assert( m_ApplicationsToolBoxController==NULL );
...@@ -124,16 +124,16 @@ MaplaMainWindow ...@@ -124,16 +124,16 @@ MaplaMainWindow
setCentralWidget( m_ApplicationsToolBoxController->GetWidget() ); setCentralWidget( m_ApplicationsToolBoxController->GetWidget() );
#else // OTB_USE_QT5 #else // OTB_USE_QT
setCentralWidget( setCentralWidget(
new QLabel( new QLabel(
tr( "Enable OTB_USE_QT5 preprocessor definition at compile time!" ), tr( "Enable OTB_USE_QT preprocessor definition at compile time!" ),
this this
) )
); );
#endif // OTB_USE_QT5 #endif // OTB_USE_QT
if( !RestoreLayout( Monteverdi_UI_VERSION ) ) if( !RestoreLayout( Monteverdi_UI_VERSION ) )
{ {
...@@ -148,7 +148,7 @@ MaplaMainWindow ...@@ -148,7 +148,7 @@ MaplaMainWindow
{ {
// //
// OTB application support. // OTB application support.
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
QObject::connect( QObject::connect(
m_ApplicationsToolBoxController->GetWidget(), m_ApplicationsToolBoxController->GetWidget(),
...@@ -217,7 +217,7 @@ MaplaMainWindow ...@@ -217,7 +217,7 @@ MaplaMainWindow
::OnApplicationToLaunchSelected( const QString & appName, ::OnApplicationToLaunchSelected( const QString & appName,
const QString & ) const QString & )
{ {
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
assert( MaplaApplication::ConstInstance()!=NULL ); assert( MaplaApplication::ConstInstance()!=NULL );
assert( MaplaApplication::ConstInstance()->GetModel()!=NULL ); assert( MaplaApplication::ConstInstance()->GetModel()!=NULL );
...@@ -241,7 +241,7 @@ MaplaMainWindow ...@@ -241,7 +241,7 @@ MaplaMainWindow
appWindow->show(); appWindow->show();
#endif // OTB_USE_QT5 #endif // OTB_USE_QT
} }
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -221,9 +221,9 @@ protected slots: ...@@ -221,9 +221,9 @@ protected slots:
/** /**
*/ */
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS #if defined( OTB_USE_QT ) && USE_OTB_APPS
void OnApplicationToLaunchSelected( const QString & appName, const QString & docName ); void OnApplicationToLaunchSelected( const QString & appName, const QString & docName );
#endif // defined( OTB_USE_QT5 ) && USE_OTB_APPS #endif // defined( OTB_USE_QT ) && USE_OTB_APPS
/** /**
*/ */
...@@ -396,7 +396,7 @@ private: ...@@ -396,7 +396,7 @@ private:
QDockWidget* m_HistogramDock; QDockWidget* m_HistogramDock;
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
/** /**
* \brief OTB-applications browser dock-widget. * \brief OTB-applications browser dock-widget.
*/ */
......
...@@ -27,7 +27,7 @@ otb_module( OTBMonteverdi ...@@ -27,7 +27,7 @@ otb_module( OTBMonteverdi
DEPENDS DEPENDS
OTBMonteverdiCore OTBMonteverdiCore
OTBMonteverdiGUI OTBMonteverdiGUI
OTBQt5 OTBQt
OTBQtAdapters OTBQtAdapters
OPTIONAL_DEPENDS OPTIONAL_DEPENDS
......
...@@ -62,7 +62,7 @@ add_library( OTBMonteverdi ...@@ -62,7 +62,7 @@ add_library( OTBMonteverdi
target_link_libraries( OTBMonteverdi target_link_libraries( OTBMonteverdi
${OTBMonteverdiCore_LIBRARIES} ${OTBMonteverdiCore_LIBRARIES}
${OTBMonteverdiGUI_LIBRARIES} ${OTBMonteverdiGUI_LIBRARIES}
${OTBQt5_LIBRARIES} ${OTBQt_LIBRARIES}
${OTBQtAdapters_LIBRARIES} ${OTBQtAdapters_LIBRARIES}
) )
otb_module_target( OTBMonteverdi ) otb_module_target( OTBMonteverdi )
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "mvdStackedLayerModel.h" #include "mvdStackedLayerModel.h"
// //
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
# include "mvdOTBApplicationsModel.h" # include "mvdOTBApplicationsModel.h"
#endif #endif
...@@ -121,7 +121,7 @@ void ...@@ -121,7 +121,7 @@ void
Application Application
::OpenApplicationsBrowser() ::OpenApplicationsBrowser()
{ {
#ifdef OTB_USE_QT5 #ifdef OTB_USE_QT
m_OTBApplicationsModel = new OTBApplicationsModel( this ); m_OTBApplicationsModel = new OTBApplicationsModel( this );
m_OTBApplicationsModel->BuildModel(); m_OTBApplicationsModel->BuildModel();
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
// Monteverdi includes (sorted by alphabetic order) // Monteverdi includes (sorted by alphabetic order)
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS #if defined( OTB_USE_QT ) && USE_OTB_APPS
# include "mvdApplicationLauncher.h" # include "mvdApplicationLauncher.h"
# include "mvdApplicationsToolBoxController.h" # include "mvdApplicationsToolBoxController.h"
# include "mvdOTBApplicationsModel.h" # include "mvdOTBApplicationsModel.h"
...@@ -131,7 +131,7 @@ MainWindow ...@@ -131,7 +131,7 @@ MainWindow
m_PixelDescriptionDock(NULL), m_PixelDescriptionDock(NULL),
#endif // USE_PIXEL_DESCRIPTION #endif // USE_PIXEL_DESCRIPTION
m_HistogramDock( NULL ), m_HistogramDock( NULL ),
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS #if defined( OTB_USE_QT ) && USE_OTB_APPS
m_OtbApplicationsBrowserDock(NULL), m_OtbApplicationsBrowserDock(NULL),
#endif #endif
m_ImageView( NULL ), m_ImageView( NULL ),
...@@ -2209,7 +2209,7 @@ MainWindow ...@@ -2209,7 +2209,7 @@ MainWindow
} }
/*****************************************************************************/ /*****************************************************************************/
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS #if defined( OTB_USE_QT ) && USE_OTB_APPS
void void
MainWindow MainWindow
...@@ -2294,7 +2294,7 @@ MainWindow ...@@ -2294,7 +2294,7 @@ MainWindow
); );
} }
#endif // defined( OTB_USE_QT5 ) && USE_OTB_APPS #endif // defined( OTB_USE_QT ) && USE_OTB_APPS
/*****************************************************************************/ /*****************************************************************************/
#if USE_TABBED_VIEW #if USE_TABBED_VIEW
...@@ -2324,7 +2324,7 @@ MainWindow ...@@ -2324,7 +2324,7 @@ MainWindow
QWidget* appWidget = m_CentralTabWidget->widget( index ); QWidget* appWidget = m_CentralTabWidget->widget( index );
assert( appWidget!=NULL ); assert( appWidget!=NULL );
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS #if defined( OTB_USE_QT ) && USE_OTB_APPS
assert( appWidget==qobject_cast< Wrapper::QtWidgetView* >( appWidget ) ); assert( appWidget==qobject_cast< Wrapper::QtWidgetView* >( appWidget ) );
Wrapper::QtWidgetView* appWidgetView = Wrapper::QtWidgetView* appWidgetView =
......
...@@ -36,7 +36,7 @@ otb_module( OTBMonteverdiCore ...@@ -36,7 +36,7 @@ otb_module( OTBMonteverdiCore
OTBObjectList OTBObjectList
OTBOSSIMAdapters OTBOSSIMAdapters
OTBProjection OTBProjection
OTBQt5 OTBQt
OTBStatistics OTBStatistics
OTBTransform OTBTransform
......
...@@ -111,7 +111,7 @@ target_link_libraries( OTBMonteverdiCore ...@@ -111,7 +111,7 @@ target_link_libraries( OTBMonteverdiCore
${OTBObjectList_LIBRARIES} ${OTBObjectList_LIBRARIES}
${OTBOSSIMAdapters_LIBRARIES} ${OTBOSSIMAdapters_LIBRARIES}
${OTBProjection_LIBRARIES} ${OTBProjection_LIBRARIES}
${OTBQt5_LIBRARIES} ${OTBQt_LIBRARIES}
${OTBStatistics_LIBRARIES} ${OTBStatistics_LIBRARIES}
${OTBTransform_LIBRARIES} ${OTBTransform_LIBRARIES}
) )
......
...@@ -29,7 +29,7 @@ otb_module( OTBMonteverdiGUI ...@@ -29,7 +29,7 @@ otb_module( OTBMonteverdiGUI
OTBIce OTBIce
OTBIOGDAL OTBIOGDAL
OTBMonteverdiCore OTBMonteverdiCore
OTBQt5 OTBQt
OTBQwt OTBQwt
OPTIONAL_DEPENDS OPTIONAL_DEPENDS
......
...@@ -25,7 +25,7 @@ ENABLE_SHARED ...@@ -25,7 +25,7 @@ ENABLE_SHARED
DEPENDS DEPENDS
OTBApplicationEngine OTBApplicationEngine
OTBITK OTBITK
OTBQt5 OTBQt
OTBQtAdapters OTBQtAdapters
TEST_DEPENDS TEST_DEPENDS
......
...@@ -114,7 +114,7 @@ add_library( OTBQtWidget ...@@ -114,7 +114,7 @@ add_library( OTBQtWidget
target_link_libraries( OTBQtWidget target_link_libraries( OTBQtWidget
${OTBApplicationEngine_LIBRARIES} ${OTBApplicationEngine_LIBRARIES}
${OTBQt5_LIBRARIES} ${OTBQt_LIBRARIES}
${OTBQtAdapters_LIBRARIES} ${OTBQtAdapters_LIBRARIES}
) )
...@@ -124,7 +124,7 @@ add_executable(otbApplicationLauncherQt otbApplicationLauncherQt.cxx) ...@@ -124,7 +124,7 @@ add_executable(otbApplicationLauncherQt otbApplicationLauncherQt.cxx)
target_link_libraries(otbApplicationLauncherQt target_link_libraries(otbApplicationLauncherQt
${OTBQtWidget_LIBRARIES} ${OTBQtWidget_LIBRARIES}
${OTBApplicationEngine_LIBRARIES} ${OTBApplicationEngine_LIBRARIES}
${OTBQt5_LIBRARIES} ${OTBQt_LIBRARIES}
) )
otb_module_target(otbApplicationLauncherQt) otb_module_target(otbApplicationLauncherQt)
set_linker_stack_size_flag(otbApplicationLauncherQt 10000000) set_linker_stack_size_flag(otbApplicationLauncherQt 10000000)
......
...@@ -91,7 +91,7 @@ if(OTB_WRAP_PYTHON3) ...@@ -91,7 +91,7 @@ if(OTB_WRAP_PYTHON3)
ADD_SUPERBUILD_CMAKE_VAR(OTB PYTHON3_EXECUTABLE) ADD_SUPERBUILD_CMAKE_VAR(OTB PYTHON3_EXECUTABLE)
endif() endif()
if(OTB_USE_QT5) if(OTB_USE_QT)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB QT5) ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB QT5)
endif() endif()
...@@ -197,7 +197,7 @@ ExternalProject_Add(OTB ...@@ -197,7 +197,7 @@ ExternalProject_Add(OTB
-DOTB_USE_MUPARSERX:BOOL=${OTB_USE_MUPARSERX} -DOTB_USE_MUPARSERX:BOOL=${OTB_USE_MUPARSERX}
-DOTB_USE_OPENCV:BOOL=${OTB_USE_OPENCV} -DOTB_USE_OPENCV:BOOL=${OTB_USE_OPENCV}
-DOTB_USE_SHARK:BOOL=${OTB_USE_SHARK} -DOTB_USE_SHARK:BOOL=${OTB_USE_SHARK}
-DOTB_USE_QT5:BOOL=${OTB_USE_QT5} -DOTB_USE_QT:BOOL=${OTB_USE_QT}
-DOTB_USE_SIFTFAST:BOOL=${OTB_USE_SIFTFAST} -DOTB_USE_SIFTFAST:BOOL=${OTB_USE_SIFTFAST}
-DOTB_USE_OPENGL:BOOL=${OTB_USE_OPENGL} -DOTB_USE_OPENGL:BOOL=${OTB_USE_OPENGL}
-DOTB_USE_GLEW:BOOL=${OTB_USE_GLEW} -DOTB_USE_GLEW:BOOL=${OTB_USE_GLEW}
......
...@@ -285,7 +285,7 @@ option(USE_SYSTEM_OPENCV "Use a system build of OpenCV" OFF) ...@@ -285,7 +285,7 @@ option(USE_SYSTEM_OPENCV "Use a system build of OpenCV" OFF)
option(USE_SYSTEM_LIBSVM "Use a system build of libsvm" OFF) option(USE_SYSTEM_LIBSVM "Use a system build of libsvm" OFF)
option(USE_SYSTEM_PCRE "Use a system build of PCRE" ON) option(USE_SYSTEM_PCRE "Use a system build of PCRE" ON)
option(USE_SYSTEM_SWIG "Use a system build of swig" ON) option(USE_SYSTEM_SWIG "Use a system build of swig" ON)
option(USE_SYSTEM_QT5 "Use a system build of QT5" OFF) option(USE_SYSTEM_QT "Use a system build of QT5" OFF)
option(USE_SYSTEM_QWT "Use a system build of Qwt" OFF) option(USE_SYSTEM_QWT "Use a system build of Qwt" OFF)
option(USE_SYSTEM_GLEW "Use a system build of GLEW" OFF) option(USE_SYSTEM_GLEW "Use a system build of GLEW" OFF)
option(USE_SYSTEM_GLFW "Use a system build of glfw" OFF) option(USE_SYSTEM_GLFW "Use a system build of glfw" OFF)
...@@ -311,7 +311,7 @@ option(OTB_USE_MAPNIK "Enable module Mapnik in OTB" OFF) ...@@ -311,7 +311,7 @@ option(OTB_USE_MAPNIK "Enable module Mapnik in OTB" OFF)
option(OTB_USE_MUPARSER "Enable module muparser in OTB" ON) option(OTB_USE_MUPARSER "Enable module muparser in OTB" ON)
option(OTB_USE_MUPARSERX "Enable module muparserX in OTB" ON) option(OTB_USE_MUPARSERX "Enable module muparserX in OTB" ON)
option(OTB_USE_OPENCV "Enable module OpenCV in OTB" ON) option(OTB_USE_OPENCV "Enable module OpenCV in OTB" ON)
option(OTB_USE_QT5 "Enable module QT5 in OTB" ON) option(OTB_USE_QT "Enable module QT5 in OTB" ON)
option(OTB_USE_SIFTFAST "Enable module Siftfast in OTB" ON) option(OTB_USE_SIFTFAST "Enable module Siftfast in OTB" ON)
option(OTB_USE_OPENGL "Enable module OpenGL in OTB" ON) option(OTB_USE_OPENGL "Enable module OpenGL in OTB" ON)
option(OTB_USE_GLEW "Enable module GLEW in OTB" ON) option(OTB_USE_GLEW "Enable module GLEW in OTB" ON)
......
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