Commit 91621226 authored by Antoine Regimbeau's avatar Antoine Regimbeau

REFAC: change qt4 to qt in macro names

parent 42c167cf
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# #
# Reset Qt I18N source files cache variable. # Reset Qt I18N source files cache variable.
macro( reset_qt5_i18n_sources ) macro( reset_qt_i18n_sources )
set( OTB_QT_I18N_INCLUDE_PATH "" CACHE INTERNAL "" FORCE ) set( OTB_QT_I18N_INCLUDE_PATH "" CACHE INTERNAL "" FORCE )
set( OTB_QT_I18N_HEADER_FILES "" CACHE INTERNAL "" FORCE ) set( OTB_QT_I18N_HEADER_FILES "" CACHE INTERNAL "" FORCE )
set( OTB_QT_I18N_SOURCE_FILES "" CACHE INTERNAL "" FORCE ) set( OTB_QT_I18N_SOURCE_FILES "" CACHE INTERNAL "" FORCE )
...@@ -33,7 +33,7 @@ endmacro() ...@@ -33,7 +33,7 @@ endmacro()
# #
# Func # Func
function( add_to_qt5_i18n_files RESULT ) function( add_to_qt_i18n_files RESULT )
foreach( F ${ARGN} ) foreach( F ${ARGN} )
#message( "${F}" ) #message( "${F}" )
...@@ -45,13 +45,13 @@ endfunction() ...@@ -45,13 +45,13 @@ endfunction()
# #
# #
macro( add_to_qt5_i18n_include_path DIRECTORY ) macro( add_to_qt_i18n_include_path DIRECTORY )
set(OTB_I18N_INCLUDE_PATH ${OTB_I18N_INCLUDE_PATH} ${DIRECTORY} CACHE INTERNAL "") set(OTB_I18N_INCLUDE_PATH ${OTB_I18N_INCLUDE_PATH} ${DIRECTORY} CACHE INTERNAL "")
endmacro() endmacro()
# #
# #
macro( add_to_qt5_i18n_headers INCLUDE_DIR ) macro( add_to_qt_i18n_headers INCLUDE_DIR )
get_filename_component( ABS_INCLUDE_DIR ${INCLUDE_DIR} ABSOLUTE ) get_filename_component( ABS_INCLUDE_DIR ${INCLUDE_DIR} ABSOLUTE )
...@@ -68,19 +68,19 @@ endmacro() ...@@ -68,19 +68,19 @@ endmacro()
# #
# Add source files to Qt I18n translation build. # Add source files to Qt I18n translation build.
macro( add_to_qt5_i18n_sources ) macro( add_to_qt_i18n_sources )
add_to_qt5_i18n_files( OTB_QT_I18N_SOURCE_FILES ${ARGN} ) add_to_qt_i18n_files( OTB_QT_I18N_SOURCE_FILES ${ARGN} )
endmacro() endmacro()
# #
# Add source files to Qt I18n translation build. # Add source files to Qt I18n translation build.
macro( add_to_qt5_i18n_forms ) macro( add_to_qt_i18n_forms )
add_to_qt5_i18n_files( OTB_QT_I18N_FORM_FILES ${ARGN} ) add_to_qt_i18n_files( OTB_QT_I18N_FORM_FILES ${ARGN} )
endmacro() endmacro()
# #
# #
macro( generate_qt5_project FILENAME ) macro( generate_qt_project FILENAME )
message( STATUS "Generating Qt5 '${FILENAME}' project file for I18N." ) message( STATUS "Generating Qt5 '${FILENAME}' project file for I18N." )
unset(_OTB_QT_I18N_INCLUDE_PATH_PRO) unset(_OTB_QT_I18N_INCLUDE_PATH_PRO)
......
...@@ -100,9 +100,9 @@ include(PreventInBuildInstalls) ...@@ -100,9 +100,9 @@ include(PreventInBuildInstalls)
include(OTBModuleMacros) include(OTBModuleMacros)
include(OTBModuleRemote) include(OTBModuleRemote)
include(OTBModuleTest) include(OTBModuleTest)
include( i18n_qt4 ) include( i18n_qt )
reset_qt4_i18n_sources() reset_qt_i18n_sources()
repository_status(${PROJECT_SOURCE_DIR} OTB_GIT_STATUS_MESSAGE) repository_status(${PROJECT_SOURCE_DIR} OTB_GIT_STATUS_MESSAGE)
......
...@@ -26,8 +26,8 @@ set( OTBQtAdapters_HEADERS_MOC ...@@ -26,8 +26,8 @@ set( OTBQtAdapters_HEADERS_MOC
# otbQtAdapters.h # otbQtAdapters.h
) )
add_to_qt4_i18n_sources( ${OTBQtAdapters_SRCS} ) add_to_qt_i18n_sources( ${OTBQtAdapters_SRCS} )
add_to_qt4_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} )
......
...@@ -66,9 +66,9 @@ qt5_wrap_ui( OTBMapla_FORMS_HEADERS ${OTBMapla_FORMS} ) ...@@ -66,9 +66,9 @@ 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")
############################################################################# #############################################################################
add_to_qt4_i18n_sources( ${OTBMapla_SRCS} ) add_to_qt_i18n_sources( ${OTBMapla_SRCS} )
add_to_qt4_i18n_headers( "../include" ${OTBMapla_SRCS} ) add_to_qt_i18n_headers( "../include" ${OTBMapla_SRCS} )
add_to_qt4_i18n_forms( ${OTBMapla_FORMS} ) add_to_qt_i18n_forms( ${OTBMapla_FORMS} )
##########################[Mapla library]#################################### ##########################[Mapla library]####################################
add_library( OTBMapla add_library( OTBMapla
......
...@@ -49,9 +49,9 @@ qt5_wrap_ui( OTBMonteverdi_FORMS_HEADERS ${OTBMonteverdi_FORMS} ) ...@@ -49,9 +49,9 @@ 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")
############################################################################# #############################################################################
add_to_qt4_i18n_sources( ${OTBMonteverdi_SRCS} ) add_to_qt_i18n_sources( ${OTBMonteverdi_SRCS} )
add_to_qt4_i18n_headers( "../include" ${OTBMonteverdi_SRCS} ) add_to_qt_i18n_headers( "../include" ${OTBMonteverdi_SRCS} )
add_to_qt4_i18n_forms( ${OTBMonteverdi_FORMS} ) add_to_qt_i18n_forms( ${OTBMonteverdi_FORMS} )
############################################################################# #############################################################################
add_library( OTBMonteverdi add_library( OTBMonteverdi
......
...@@ -90,8 +90,8 @@ if( OTBApplicationEngine_ENABLED ) ...@@ -90,8 +90,8 @@ if( OTBApplicationEngine_ENABLED )
endif() endif()
############################################################################# #############################################################################
add_to_qt4_i18n_sources( ${OTBMonteverdiCore_SRCS} ) add_to_qt_i18n_sources( ${OTBMonteverdiCore_SRCS} )
add_to_qt4_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} )
......
...@@ -179,9 +179,9 @@ qt5_wrap_ui( OTBMonteverdiGUI_FORMS_HEADERS ${OTBMonteverdiGUI_FORMS} ) ...@@ -179,9 +179,9 @@ qt5_wrap_ui( OTBMonteverdiGUI_FORMS_HEADERS ${OTBMonteverdiGUI_FORMS} )
qt5_add_resources( OTBMonteverdiGUI_RESOURCES_RCC ${OTBMonteverdiGUI_RESOURCES} ) qt5_add_resources( OTBMonteverdiGUI_RESOURCES_RCC ${OTBMonteverdiGUI_RESOURCES} )
############################################################################# #############################################################################
add_to_qt4_i18n_sources( ${OTBMonteverdiGUI_SRCS} ) add_to_qt_i18n_sources( ${OTBMonteverdiGUI_SRCS} )
add_to_qt4_i18n_headers( "../include" ${OTBMonteverdiGUI_SRCS} ) add_to_qt_i18n_headers( "../include" ${OTBMonteverdiGUI_SRCS} )
add_to_qt4_i18n_forms( ${OTBMonteverdiGUI_FORMS} ) add_to_qt_i18n_forms( ${OTBMonteverdiGUI_FORMS} )
############################################################################# #############################################################################
add_library( OTBMonteverdiGUI add_library( OTBMonteverdiGUI
......
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