Commit 0a957d7c authored by Manuel Grizonnet's avatar Manuel Grizonnet

Merge branch '1661-monteverdi-build-error-superbuild' into 'develop'

Resolve "Monteverdi build error (superbuild)"

Closes #1661

See merge request orfeotoolbox/otb!195
parents 46f657df 4d22cc0d
...@@ -29,11 +29,11 @@ set( OTBQtAdapters_HEADERS_MOC ...@@ -29,11 +29,11 @@ set( OTBQtAdapters_HEADERS_MOC
add_to_qt_i18n_sources( ${OTBQtAdapters_SRCS} ) add_to_qt_i18n_sources( ${OTBQtAdapters_SRCS} )
add_to_qt_i18n_headers( "../include" ${OTBQtAdapters_SRCS} ) add_to_qt_i18n_headers( "../include" ${OTBQtAdapters_SRCS} )
qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} ) qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} OPTIONS -p "." )
add_library( OTBQtAdapters ${OTBQtAdapters_SRC} ${OTBQtAdapters_SRC_MOC}) add_library( OTBQtAdapters ${OTBQtAdapters_SRC} ${OTBQtAdapters_SRC_MOC})
target_link_libraries( OTBQtAdapters target_link_libraries( OTBQtAdapters
${OTBQt_LIBRARIES} ${OTBQt_LIBRARIES}
) )
......
...@@ -61,7 +61,7 @@ if (WIN32) ...@@ -61,7 +61,7 @@ if (WIN32)
endif() endif()
############################################################################# #############################################################################
qt5_wrap_cpp( OTBMapla_SRC_MOC ${OTBMapla_HEADERS_MOC} ) qt5_wrap_cpp( OTBMapla_SRC_MOC ${OTBMapla_HEADERS_MOC} OPTIONS -p "." )
qt5_wrap_ui( OTBMapla_FORMS_HEADERS ${OTBMapla_FORMS} ) qt5_wrap_ui( OTBMapla_FORMS_HEADERS ${OTBMapla_FORMS} )
qt5_add_resources( OTBMapla_RESOURCES_RCC ${OTBMapla_RESOURCES} OPTIONS "-no-compress") qt5_add_resources( OTBMapla_RESOURCES_RCC ${OTBMapla_RESOURCES} OPTIONS "-no-compress")
......
...@@ -44,7 +44,7 @@ set( OTBMonteverdi_RESOURCES ...@@ -44,7 +44,7 @@ set( OTBMonteverdi_RESOURCES
) )
############################################################################# #############################################################################
qt5_wrap_cpp( OTBMonteverdi_SRC_MOC ${OTBMonteverdi_HEADERS_MOC} ) qt5_wrap_cpp( OTBMonteverdi_SRC_MOC ${OTBMonteverdi_HEADERS_MOC} OPTIONS -p "." )
qt5_wrap_ui( OTBMonteverdi_FORMS_HEADERS ${OTBMonteverdi_FORMS} ) qt5_wrap_ui( OTBMonteverdi_FORMS_HEADERS ${OTBMonteverdi_FORMS} )
qt5_add_resources( OTBMonteverdi_RESOURCES_RCC ${OTBMonteverdi_RESOURCES} OPTIONS "-no-compress") qt5_add_resources( OTBMonteverdi_RESOURCES_RCC ${OTBMonteverdi_RESOURCES} OPTIONS "-no-compress")
......
...@@ -94,7 +94,7 @@ add_to_qt_i18n_sources( ${OTBMonteverdiCore_SRCS} ) ...@@ -94,7 +94,7 @@ add_to_qt_i18n_sources( ${OTBMonteverdiCore_SRCS} )
add_to_qt_i18n_headers( "../include" ${OTBMonteverdiCore_SRCS} ) add_to_qt_i18n_headers( "../include" ${OTBMonteverdiCore_SRCS} )
############################################################################# #############################################################################
qt5_wrap_cpp( OTBMonteverdiCore_SRC_MOC ${OTBMonteverdiCore_HEADERS_MOC} ) qt5_wrap_cpp( OTBMonteverdiCore_SRC_MOC ${OTBMonteverdiCore_HEADERS_MOC} OPTIONS -p "." )
add_library( OTBMonteverdiCore ${OTBMonteverdiCore_SRCS} ${OTBMonteverdiCore_SRC_MOC}) add_library( OTBMonteverdiCore ${OTBMonteverdiCore_SRCS} ${OTBMonteverdiCore_SRC_MOC})
......
...@@ -174,7 +174,7 @@ if( OTBQtWidget_ENABLED ) ...@@ -174,7 +174,7 @@ if( OTBQtWidget_ENABLED )
endif() endif()
############################################################################# #############################################################################
qt5_wrap_cpp( OTBMonteverdiGUI_SRC_MOC ${OTBMonteverdiGUI_HEADERS_MOC} ) qt5_wrap_cpp( OTBMonteverdiGUI_SRC_MOC ${OTBMonteverdiGUI_HEADERS_MOC} OPTIONS -p "." )
qt5_wrap_ui( OTBMonteverdiGUI_FORMS_HEADERS ${OTBMonteverdiGUI_FORMS} ) qt5_wrap_ui( OTBMonteverdiGUI_FORMS_HEADERS ${OTBMonteverdiGUI_FORMS} )
qt5_add_resources( OTBMonteverdiGUI_RESOURCES_RCC ${OTBMonteverdiGUI_RESOURCES} ) qt5_add_resources( OTBMonteverdiGUI_RESOURCES_RCC ${OTBMonteverdiGUI_RESOURCES} )
......
...@@ -111,7 +111,7 @@ set( OTBQtWidget_RESOURCES ...@@ -111,7 +111,7 @@ set( OTBQtWidget_RESOURCES
otbWrapperQtWidgetIcons.qrc otbWrapperQtWidgetIcons.qrc
) )
qt5_wrap_cpp( OTBQtWidget_MOC_SRC ${OTBQtWidget_MOC_HDR} ) qt5_wrap_cpp( OTBQtWidget_MOC_SRC ${OTBQtWidget_MOC_HDR} OPTIONS -p "." )
qt5_wrap_ui( OTBQtWidget_FORMS_HEADERS ${OTBQtWidget_FORMS} ) qt5_wrap_ui( OTBQtWidget_FORMS_HEADERS ${OTBQtWidget_FORMS} )
qt5_add_resources( OTBQtWidget_RESOURCES_RCC ${OTBQtWidget_RESOURCES} OPTIONS "-no-compress") qt5_add_resources( OTBQtWidget_RESOURCES_RCC ${OTBQtWidget_RESOURCES} OPTIONS "-no-compress")
......
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