Commit c0c20d16 authored by Stéphane Albert's avatar Stéphane Albert

ENH: Update build configuration, licence text etc. by replacing Monteverdi2 and Mv2 by Monteverdi.

parent 4896be5d
# Get the translation files coming with Qt, and install them in the bundle
# They are loaded by Monteverdi2.
# They are loaded by Monteverdi.
function(get_qt_translation_files RESULT)
# These files are the "qt_<localename>.qm" files
# They are located in QT_TRANSLATIONS_DIR, which comes from FindQt4
......@@ -21,11 +21,11 @@ endfunction()
function(create_cpack_config application)
#should we handle this when calling function ?
#for now mapla has no specific version or it is same as monteverdi2
SET(CPACK_PACKAGE_VERSION "${Monteverdi2_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}.${Monteverdi2_VERSION_PATCH}")
SET(CPACK_PACKAGE_VERSION_MAJOR "${Monteverdi2_VERSION_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${Monteverdi2_VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${Monteverdi2_VERSION_PATCH}")
#for now mapla has no specific version or it is same as monteverdi
SET(CPACK_PACKAGE_VERSION "${Monteverdi_VERSION_MAJOR}.${Monteverdi_VERSION_MINOR}.${Monteverdi_VERSION_PATCH}")
SET(CPACK_PACKAGE_VERSION_MAJOR "${Monteverdi_VERSION_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${Monteverdi_VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${Monteverdi_VERSION_PATCH}")
if(WIN32)
set(arch_prefix win32)
......@@ -52,10 +52,10 @@ function(create_cpack_config application)
set(arch_prefix Darwin64)
endif()
SET(CPACK_GENERATOR "Bundle")
SET(CPACK_BUNDLE_ICON "${Monteverdi2_SOURCE_DIR}/Packaging/MacOS/Monteverdi2.icns" )
SET(CPACK_BUNDLE_NAME "${application}-${CPACK_PACKAGE_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}" )
SET(CPACK_BUNDLE_ICON "${Monteverdi_SOURCE_DIR}/Packaging/MacOS/Monteverdi.icns" )
SET(CPACK_BUNDLE_NAME "${application}-${CPACK_PACKAGE_VERSION_MAJOR}.${Monteverdi_VERSION_MINOR}" )
SET(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Packaging/MacOS/${application}-Info.plist" )
SET(CPACK_BUNDLE_STARTUP_COMMAND "${Monteverdi2_SOURCE_DIR}/Packaging/MacOS/${application}-StartupCommand" )
SET(CPACK_BUNDLE_STARTUP_COMMAND "${Monteverdi_SOURCE_DIR}/Packaging/MacOS/${application}-StartupCommand" )
endif()
......@@ -68,17 +68,17 @@ function(create_cpack_config application)
##################################
SET(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
SET(CPACK_MODULE_PATH "${Monteverdi2_SOURCE_DIR}/CMake")
SET(CPACK_MODULE_PATH "${Monteverdi_SOURCE_DIR}/CMake")
SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
SET(CPACK_PACKAGE_CONTACT "contact@orfeo-toolbox.org")
SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${Monteverdi2_SOURCE_DIR}/Description.txt")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${Monteverdi_SOURCE_DIR}/Description.txt")
SET(CPACK_RESOURCE_FILE_LICENSE "${Monteverdi2_SOURCE_DIR}/Copyright/Copyright.txt")
SET(CPACK_RESOURCE_FILE_LICENSE "${Monteverdi_SOURCE_DIR}/Copyright/Copyright.txt")
SET(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackConfig-${application}.cmake")
SET(CPACK_NSIS_MUI_ICON "${Monteverdi2_SOURCE_DIR}/Data/Icons/monteverdi2.ico")
SET(CPACK_NSIS_MUI_UNIICON "${Monteverdi2_SOURCE_DIR}/Data/Icons/monteverdi2.ico")
SET(CPACK_NSIS_MUI_ICON "${Monteverdi_SOURCE_DIR}/Data/Icons/monteverdi.ico")
SET(CPACK_NSIS_MUI_UNIICON "${Monteverdi_SOURCE_DIR}/Data/Icons/monteverdi.ico")
SET(CPACK_COMPONENTS_ALL)
LIST(APPEND CPACK_COMPONENTS_ALL "Resources")
......@@ -93,7 +93,7 @@ function(create_cpack_config application)
SET(CPACK_COMPONENT_RESOURCES_HIDDEN ON)
SET(CPACK_COMPONENT_MAPLA_REQUIRED ON)
SET(CPACK_COMPONENT_MONTEVERDI2_REQUIRED ON)
SET(CPACK_COMPONENT_MONTEVERDI_REQUIRED ON)
SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};${application};ALL;/")
......@@ -125,7 +125,7 @@ function(configure_app_package app need_apps)
# The following DLL handling is very specific
# both to OSGeo4W flavour (32 bit or 64 bit), OSGeo4W package state
# and the compiler used to make the Monteverdi2 installer (VC2010)
# and the compiler used to make the Monteverdi installer (VC2010)
# Don't expect too much of it without VC2010.
# For some reason, fixup_bundle won't package the msvc runtime dll
......@@ -175,11 +175,11 @@ function(configure_app_package app need_apps)
COMPONENT Runtime)
install(
FILES ${Monteverdi2_SOURCE_DIR}/Packaging/Windows/${EXECUTABLE_NAME}.bat
FILES ${Monteverdi_SOURCE_DIR}/Packaging/Windows/${EXECUTABLE_NAME}.bat
DESTINATION bin
COMPONENT ${app})
if(Monteverdi2_USE_CPACK )
if(Monteverdi_USE_CPACK )
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${app}")
create_cpack_config(${app})
endif()
......@@ -197,7 +197,7 @@ function(configure_app_package app need_apps)
set(APP_DATA_DIR ${APP_PREFIX_DIR}/Resources/gdal)
install(
FILES ${CMAKE_SOURCE_DIR}/Packaging/MacOS/Monteverdi2.icns
FILES ${CMAKE_SOURCE_DIR}/Packaging/MacOS/Monteverdi.icns
DESTINATION ${APP_PREFIX_DIR}/Resources
COMPONENT Resources)
......@@ -224,7 +224,7 @@ function(configure_app_package app need_apps)
get_filename_component(APP_TS_FILENAME ${APP_TS_FILE} NAME_WE)
install(
FILES ${CMAKE_BINARY_DIR}/i18n/${APP_TS_FILENAME}.qm
DESTINATION ${APP_PREFIX_DIR}/${Monteverdi2_INSTALL_DATA_DIR}/i18n/
DESTINATION ${APP_PREFIX_DIR}/${Monteverdi_INSTALL_DATA_DIR}/i18n/
COMPONENT Resources)
endforeach()
......@@ -257,7 +257,7 @@ function(configure_app_package app need_apps)
file(TO_CMAKE_PATH "$ENV{GDAL_DATA}" GDAL_DATA)
if(NOT GDAL_DATA)
if(Monteverdi2_USE_CPACK)
if(Monteverdi_USE_CPACK)
message(FATAL_ERROR "Cannot generate installer without GDAL_DATA : GDAL_DATA")
else()
message(WARNING "Cannot generate installer without GDAL_DATA : GDAL_DATA")
......@@ -324,7 +324,7 @@ macro(create_monteverdi_application)
cmake_parse_arguments(APPLICATION "" "NAME;OUTPUT_NAME;COMPONENT_NAME;NEEDS_OTB_APPS" "SOURCES;LINK_LIBRARIES" ${ARGN} )
if(Monteverdi2_USE_CPACK)
if(Monteverdi_USE_CPACK)
if(NOT DEFINED APPLICATION_NEEDS_OTB_APPS OR APPLICATION_NEEDS_OTB_APPS)
set(APPLICATION_NEEDS_OTB_APPS TRUE)
......@@ -356,7 +356,7 @@ macro(create_monteverdi_application)
endif()
if(APPLE)
if(Monteverdi2_USE_CPACK)
if(Monteverdi_USE_CPACK)
set(MACOS_FILES_DIR "${CMAKE_SOURCE_DIR}/Packaging/MacOS")
configure_file(${MACOS_FILES_DIR}/Info.plist.in
......@@ -368,7 +368,7 @@ macro(create_monteverdi_application)
@ONLY)
set_target_properties(${APPLICATION_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Code/Application/${APPLICATION_NAME}/Info.plist")
endif(Monteverdi2_USE_CPACK)
endif(Monteverdi_USE_CPACK)
endif(APPLE)
......@@ -378,16 +378,16 @@ macro(create_monteverdi_application)
install(
TARGETS ${APPLICATION_NAME}
BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT ${APPLICATION_COMPONENT_NAME}
RUNTIME DESTINATION ${Monteverdi2_INSTALL_BIN_DIR} COMPONENT ${APPLICATION_COMPONENT_NAME}
LIBRARY DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT ${APPLICATION_COMPONENT_NAME}
ARCHIVE DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT ${APPLICATION_COMPONENT_NAME}
RUNTIME DESTINATION ${Monteverdi_INSTALL_BIN_DIR} COMPONENT ${APPLICATION_COMPONENT_NAME}
LIBRARY DESTINATION ${Monteverdi_INSTALL_LIB_DIR} COMPONENT ${APPLICATION_COMPONENT_NAME}
ARCHIVE DESTINATION ${Monteverdi_INSTALL_LIB_DIR} COMPONENT ${APPLICATION_COMPONENT_NAME}
)
#############################################################################
if(Monteverdi2_USE_CPACK)
if(Monteverdi_USE_CPACK)
configure_app_package(${APPLICATION_COMPONENT_NAME} ${APPLICATION_NEEDS_OTB_APPS})
endif(Monteverdi2_USE_CPACK)
endif(Monteverdi_USE_CPACK)
endmacro(create_monteverdi_application)
\ No newline at end of file
......@@ -8,9 +8,9 @@ macro( deploy_qt_conf TARGET_NAME )
COMMAND ${CMAKE_COMMAND}
ARGS -D QT_TRANSLATIONS_DIR:PATH=${QT_TRANSLATIONS_DIR}
-D QT_PLUGINS_DIR:PATH=${QT_PLUGINS_DIR}
-D Monteverdi2_SOURCE_DIR:PATH=${Monteverdi2_SOURCE_DIR}
-D Monteverdi_SOURCE_DIR:PATH=${Monteverdi_SOURCE_DIR}
-D TARGET_DIR:PATH=$<TARGET_FILE_DIR:${TARGET_NAME}>
-P ${Monteverdi2_SOURCE_DIR}/CMake/DeployQtConfScript.cmake
-P ${Monteverdi_SOURCE_DIR}/CMake/DeployQtConfScript.cmake
COMMENT "Deploying qt.conf in ${TARGET_NAME} build dir"
VERBATIM
)
......
configure_file(${Monteverdi2_SOURCE_DIR}/CMake/qt.conf.in
configure_file(${Monteverdi_SOURCE_DIR}/CMake/qt.conf.in
${TARGET_DIR}/qt.conf
@ONLY)
\ No newline at end of file
......@@ -30,21 +30,21 @@ macro(package_mingw)
endif()
install_common(${PACKAGE_NEEDS_OTB_APPS})
##################################"#monteverdi2 stuff ##################################################
file(GLOB MVD_BATFILES ${Monteverdi2_SOURCE_DIR}/Packaging/Windows/*.bat)
################################### Monteverdi stuff ######################
file(GLOB MVD_BATFILES ${Monteverdi_SOURCE_DIR}/Packaging/Windows/*.bat)
foreach(MVD_BATFILE ${MVD_BATFILES})
install(
FILES ${MVD_BATFILE}
DESTINATION "${PACKAGE_PREFIX_DIR}/bin")
endforeach()
file(GLOB APP_TS_FILES ${Monteverdi2_SOURCE_DIR}/i18n/*.ts) # qm files
file(GLOB APP_TS_FILES ${Monteverdi_SOURCE_DIR}/i18n/*.ts) # qm files
foreach(APP_TS_FILE ${APP_TS_FILES})
get_filename_component(APP_TS_FILENAME ${APP_TS_FILE} NAME_WE)
install(FILES ${Monteverdi2_BINARY_DIR}/i18n/${APP_TS_FILENAME}.qm
DESTINATION ${PACKAGE_PREFIX_DIR}/${Monteverdi2_INSTALL_DATA_DIR}/i18n)
install(FILES ${Monteverdi_BINARY_DIR}/i18n/${APP_TS_FILENAME}.qm
DESTINATION ${PACKAGE_PREFIX_DIR}/${Monteverdi_INSTALL_DATA_DIR}/i18n)
endforeach()
##################################"#monteverdi2 stuff ##################################################
################################### Monteverdi stuff ######################
#dependency resolution based on copydlldeps.sh from mxe by Timothy Gu
......
#
# Declare and initialize variable to be present in parent scope.
# set( Monteverdi2_I18N_SOURCE_FILES
# set( Monteverdi_I18N_SOURCE_FILES
# ""
# CACHE INTERNAL "" FORCE
# )
......@@ -10,8 +10,8 @@ macro( add_to_qt4_i18n_sources SOURCE_FILES )
foreach(SOURCE_FILE ${ARGV})
get_filename_component( ABS_SOURCE_FILE ${SOURCE_FILE} ABSOLUTE )
set( Monteverdi2_I18N_SOURCE_FILES
${Monteverdi2_I18N_SOURCE_FILES} ${ABS_SOURCE_FILE}
set( Monteverdi_I18N_SOURCE_FILES
${Monteverdi_I18N_SOURCE_FILES} ${ABS_SOURCE_FILE}
CACHE INTERNAL "" FORCE
)
endforeach()
......
This diff is collapsed.
......@@ -29,14 +29,14 @@ include_directories(
# ${ICE_INCLUDE_DIRS}
# ${QWT_INCLUDE_DIRS}
#
${Monteverdi2_BINARY_DIR}
${Monteverdi_BINARY_DIR}
#
${Monteverdi2_SOURCE_DIR}/Code/Common
${Monteverdi_SOURCE_DIR}/Code/Common
#
${Monteverdi2_SOURCE_DIR}/Code/Application/Mapla
${Monteverdi2_BINARY_DIR}/Code/Application/Mapla
${Monteverdi_SOURCE_DIR}/Code/Application/Mapla
${Monteverdi_BINARY_DIR}/Code/Application/Mapla
#
${Monteverdi2_SOURCE_DIR}/Data/Icons
${Monteverdi_SOURCE_DIR}/Data/Icons
)
#############################################################################
......@@ -57,7 +57,7 @@ add_to_qt4_i18n_sources(
if (WIN32)
# Windows Resource file need to have the full path to icon
# if the .ico is not in the current dir
set( Mapla_WIN32_ICON ${Monteverdi2_SOURCE_DIR}/Data/Icons/monteverdi2.ico)
set( Mapla_WIN32_ICON ${Monteverdi_SOURCE_DIR}/Data/Icons/monteverdi.ico)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/mvdWin32.rc.in
${CMAKE_CURRENT_BINARY_DIR}/mvdWin32.rc
......@@ -75,7 +75,7 @@ endif()
#############################################################################
# Mapla library
# STATIC so that the monteverdi2 executable does not depend on another shared lib
# STATIC so that the monteverdi executable does not depend on another shared lib
# The library is also used in tests, waiting for a better test strategy
# The library is not installed
......@@ -86,12 +86,12 @@ endif()
# ${Mapla_SRC_MOC}
# )
# target_link_libraries( Mapla
# Monteverdi2_Gui
# Monteverdi_Gui
# )
# if (OTB_USE_QT4)
# target_link_libraries( Mapla
# Monteverdi2_ApplicationsWrapper
# Monteverdi_ApplicationsWrapper
# )
# endif()
......@@ -105,7 +105,7 @@ create_monteverdi_application(NAME mapla
${Mapla_SOURCES}
${Mapla_FORMS_HEADERS}
${Mapla_SRC_MOC}
LINK_LIBRARIES Monteverdi2_Gui
LINK_LIBRARIES Monteverdi_Gui
${QT_QTMAIN_LIBRARY}
OUTPUT_NAME ${MAPLA_OUTPUT_NAME}
COMPONENT_NAME Mapla
......@@ -115,6 +115,6 @@ create_monteverdi_application(NAME mapla
if( OTBQtWidget_LOADED )
target_link_libraries( mapla
Monteverdi2_ApplicationsWrapper
Monteverdi_ApplicationsWrapper
)
endif()
/*=========================================================================
Program: Monteverdi2
Program: Monteverdi
Language: C++
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See Copyright.txt for details.
Monteverdi2 is distributed under the CeCILL licence version 2. See
Monteverdi is distributed under the CeCILL licence version 2. See
Licence_CeCILL_V2-en.txt or
http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt for more details.
......@@ -20,7 +20,7 @@
//
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
#include "ConfigureMonteverdi.h"
/*****************************************************************************/
......@@ -136,11 +136,11 @@ main( int argc, char* argv[] )
QMessageBox::critical(
&mainWindow,
QCoreApplication::translate(
"Monteverdi2",
"Monteverdi2 - Critical error!"
"Monteverdi",
"Monteverdi - Critical error!"
),
QCoreApplication::translate(
"Monteverdi2",
"Monteverdi",
"Error while creating cache repository.\n\n"
"%1\n\n"
"Application will exit!"
......@@ -165,14 +165,14 @@ main( int argc, char* argv[] )
QMessageBox::warning(
&mainWindow,
QCoreApplication::translate(
"Monteverdi2",
"Monteverdi2 - Warning!"
"Monteverdi",
"Monteverdi - Warning!"
),
QCoreApplication::translate(
"Monteverdi2",
"Monteverdi",
"There are %1 outdated dataset(s) in cache-directory.\n\n"
"Please remove cache-directory '%2' and restart Monteverdi2\n\n"
"Do you want to delete cache-directory '%2' before quitting Monteverdi2?"
"Please remove cache-directory '%2' and restart Monteverdi\n\n"
"Do you want to delete cache-directory '%2' before quitting Monteverdi?"
).arg( nb ).arg( application->GetCacheDir().path() ),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::Yes
......@@ -185,7 +185,7 @@ main( int argc, char* argv[] )
// throw std::runtime_error(
// mvd::ToStdString(
// QCoreApplication::translate(
// "Monteverdi2",
// "Monteverdi",
// "Tryed to remove home dir."
// )
// )
......@@ -194,12 +194,12 @@ main( int argc, char* argv[] )
QMessageBox::critical(
&mainWindow,
QCoreApplication::translate(
"Monteverdi2",
"Monteverdi2 - Critical error!"
"Monteverdi",
"Monteverdi - Critical error!"
),
QCoreApplication::translate(
"Monteverdi2",
"Your Monteverdi2 cache-directory is set to your home directory '%1'. Deletion of cache-directory is aborted to avoid unrecoverable loss of all your account data.\n\nIt is generally a bad idea to set Monteverdi2 cache-directory to your home directory. Please choose another sub-directory.\n\nApplication will now exit."
"Monteverdi",
"Your Monteverdi cache-directory is set to your home directory '%1'. Deletion of cache-directory is aborted to avoid unrecoverable loss of all your account data.\n\nIt is generally a bad idea to set Monteverdi cache-directory to your home directory. Please choose another sub-directory.\n\nApplication will now exit."
)
.arg( application->GetCacheDir().path() ),
QMessageBox::Ok
......@@ -221,12 +221,12 @@ main( int argc, char* argv[] )
QMessageBox::critical(
&mainWindow,
QCoreApplication::translate(
"Monteverdi2",
"Monteverdi2 - Critical error!"
"Monteverdi",
"Monteverdi - Critical error!"
),
QCoreApplication::translate(
"Monteverdi2",
"Failed to open Monteverdi2 database.\n\nApplication will now exit!\n\n%2\n\nPlease, remove your Monteverdi2 cache-directory."
"Monteverdi",
"Failed to open Monteverdi database.\n\nApplication will now exit!\n\n%2\n\nPlease, remove your Monteverdi cache-directory."
)
.arg( exc.what() ),
QMessageBox::Ok
......
/*=========================================================================
Program: Monteverdi2
Program: Monteverdi
Language: C++
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See Copyright.txt for details.
Monteverdi2 is distributed under the CeCILL licence version 2. See
Monteverdi is distributed under the CeCILL licence version 2. See
Licence_CeCILL_V2-en.txt or
http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt for more details.
......@@ -87,7 +87,7 @@ Application
setObjectName( "Application" );
InitializeCore(
"Monteverdi2 Application Launcher", Monteverdi2_VERSION_STRING,
"Monteverdi Application Launcher", Monteverdi_VERSION_STRING,
"OrfeoToolBox", "orfeo-toolbox.org"
);
}
......
/*=========================================================================
Program: Monteverdi2
Program: Monteverdi
Language: C++
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See Copyright.txt for details.
Monteverdi2 is distributed under the CeCILL licence version 2. See
Monteverdi is distributed under the CeCILL licence version 2. See
Licence_CeCILL_V2-en.txt or
http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt for more details.
......@@ -23,7 +23,7 @@
//
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
#include "ConfigureMonteverdi.h"
/*****************************************************************************/
......@@ -68,7 +68,7 @@ class OTBApplicationsModel;
/** \class Application
*
*/
class Monteverdi2_EXPORT Application
class Monteverdi_EXPORT Application
: public I18nApplication
{
......
/*=========================================================================
Program: Monteverdi2
Program: Monteverdi
Language: C++
Date: $Date$
Version: $Revision$
......
/*=========================================================================
Program: Monteverdi2
Program: Monteverdi
Language: C++
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See Copyright.txt for details.
Monteverdi2 is distributed under the CeCILL licence version 2. See
Monteverdi is distributed under the CeCILL licence version 2. See
Licence_CeCILL_V2-en.txt or
http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt for more details.
......@@ -23,7 +23,7 @@
//
// Configuration include.
//// Included at first position before any other ones.
#include "ConfigureMonteverdi2.h"
#include "ConfigureMonteverdi.h"
/*****************************************************************************/
/* INCLUDE SECTION */
......@@ -78,7 +78,7 @@ class MainWindow;
*
* \brief The application main-widow widget.
*/
class Monteverdi2_EXPORT MainWindow
class Monteverdi_EXPORT MainWindow
: public I18nMainWindow
{
......
<RCC>
<qresource prefix="/icons">
<file>../../../Data/Icons/zoom-1to1.png</file>
<file alias="otb">../../../Data/Icons/monteverdi2-32x32.png</file>
<file alias="otb">../../../Data/Icons/monteverdi-32x32.png</file>
<file alias="process">../../../Data/Icons/alg.png</file>
<file>../../../Data/Icons/execute.png</file>
<file>../../../Data/Icons/locked.png</file>
......@@ -14,7 +14,7 @@
<file alias="action_Open_Icon">../../../Data/Icons/document-open_32x32.png</file>
</qresource>
<qresource prefix="/images">
<file alias="application_icon">../../../Data/Icons/monteverdi2-128x128.png</file>
<file alias="application_splash">../../../Data/Icons/monteverdi2-splash.png</file>
<file alias="application_icon">../../../Data/Icons/monteverdi-128x128.png</file>
<file alias="application_splash">../../../Data/Icons/monteverdi-splash.png</file>
</qresource>
</RCC>
......@@ -3,8 +3,8 @@
IDI_ICON1 ICON DISCARDABLE "@Mapla_WIN32_ICON@"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @Monteverdi2_VERSION_MAJOR@,@Monteverdi2_VERSION_MINOR@,@Monteverdi2_VERSION_PATCH@,0
PRODUCTVERSION @Monteverdi2_VERSION_MAJOR@,@Monteverdi2_VERSION_MINOR@,@Monteverdi2_VERSION_PATCH@,0
FILEVERSION @Monteverdi_VERSION_MAJOR@,@Monteverdi_VERSION_MINOR@,@Monteverdi_VERSION_PATCH@,0
PRODUCTVERSION @Monteverdi_VERSION_MAJOR@,@Monteverdi_VERSION_MINOR@,@Monteverdi_VERSION_PATCH@,0
FILEFLAGS 0x0L
FILEFLAGSMASK 0x3fL
FILEOS 0x00040004L
......@@ -17,12 +17,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "OrfeoToolbox"
VALUE "FileDescription", "Monteverdi 2"
VALUE "FileVersion", "@Monteverdi2_VERSION_MAJOR@.@Monteverdi2_VERSION_MINOR@.@Monteverdi2_VERSION_PATCH@.0"
VALUE "FileVersion", "@Monteverdi_VERSION_MAJOR@.@Monteverdi_VERSION_MINOR@.@Monteverdi_VERSION_PATCH@.0"
VALUE "LegalCopyright", "Copyright (c) 2012-2013 Centre National d'Etudes Spatiales. All rights reserved."
VALUE "InternalName", "mapla"
VALUE "OriginalFilename", "mapla.exe"
VALUE "ProductName", "Mapla"
VALUE "ProductVersion", "@Monteverdi2_VERSION_MAJOR@.@Monteverdi2_VERSION_MINOR@.@Monteverdi2_VERSION_PATCH@.0"
VALUE "ProductVersion", "@Monteverdi_VERSION_MAJOR@.@Monteverdi_VERSION_MINOR@.@Monteverdi_VERSION_PATCH@.0"
END
END
BLOCK "VarFileInfo"
......
#############################################################################
# Input files.
set( Monteverdi2_App_SOURCES
set( Monteverdi_App_SOURCES
mvdApplication.cxx
mvdMainWindow.cxx
mvdPreferencesDialog.cxx
)
# Headers for classes with Q_OBJECT macro (needs to go to Qt moc)
set( Monteverdi2_App_HEADERS_MOC
set( Monteverdi_App_HEADERS_MOC
mvdApplication.h
mvdMainWindow.h
mvdPreferencesDialog.h
)
# Qt designer UI files
set( Monteverdi2_App_FORMS
set( Monteverdi_App_FORMS
mvdMainWindow.ui
mvdPreferencesDialog.ui
)
# Qt resources included in executable
set( Monteverdi2_App_RESOURCES
set( Monteverdi_App_RESOURCES
mvdMainWindow.qrc
)
......@@ -29,35 +29,35 @@ include_directories(
${ICE_INCLUDE_DIRS}
${QWT_INCLUDE_DIRS}
#
${Monteverdi2_BINARY_DIR}
${Monteverdi_BINARY_DIR}
#
${Monteverdi2_SOURCE_DIR}/Code/Common
${Monteverdi_SOURCE_DIR}/Code/Common
#
${Monteverdi2_SOURCE_DIR}/Code/Application/Monteverdi
${Monteverdi2_BINARY_DIR}/Code/Application/Monteverdi
${Monteverdi_SOURCE_DIR}/Code/Application/Monteverdi
${Monteverdi_BINARY_DIR}/Code/Application/Monteverdi
#
${Monteverdi2_SOURCE_DIR}/Data/Icons
${Monteverdi_SOURCE_DIR}/Data/Icons
)
#############################################################################
# Qt4 wrapped files.
qt4_wrap_cpp( Monteverdi2_App_SRC_MOC ${Monteverdi2_App_HEADERS_MOC} )
qt4_wrap_ui( Monteverdi2_App_FORMS_HEADERS ${Monteverdi2_App_FORMS} )
qt4_add_resources( Monteverdi2_App_RESOURCES_RCC ${Monteverdi2_App_RESOURCES} )
qt4_wrap_cpp( Monteverdi_App_SRC_MOC ${Monteverdi_App_HEADERS_MOC} )
qt4_wrap_ui( Monteverdi_App_FORMS_HEADERS ${Monteverdi_App_FORMS} )
qt4_add_resources( Monteverdi_App_RESOURCES_RCC ${Monteverdi_App_RESOURCES} )
#############################################################################
# Sources files to translate.
add_to_qt4_i18n_sources(
main.cxx
${Monteverdi2_App_SOURCES}
${Monteverdi2_App_HEADERS_MOC}
${Monteverdi2_App_FORMS}
${Monteverdi_App_SOURCES}
${Monteverdi_App_HEADERS_MOC}
${Monteverdi_App_FORMS}
)
if (WIN32)
# Windows Resource file need to have the full path to icon
# if the .ico is not in the current dir
set( Monteverdi2_App_WIN32_ICON ${Monteverdi2_SOURCE_DIR}/Data/Icons/monteverdi2.ico)
set( Monteverdi_App_WIN32_ICON ${Monteverdi_SOURCE_DIR}/Data/Icons/monteverdi.ico)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/mvdWin32.rc.in
${CMAKE_CURRENT_BINARY_DIR}/mvdWin32.rc
......@@ -69,37 +69,37 @@ if (WIN32)
endif()
# The RC file to be added to source list
set( Monteverdi2_App_WIN32_RC_FILE ${CMAKE_CURRENT_BINARY_DIR}/mvdWin32.rc )
set( Monteverdi_App_WIN32_RC_FILE ${CMAKE_CURRENT_BINARY_DIR}/mvdWin32.rc )
endif()
#############################################################################
# Monteverdi2_App library
# STATIC so that the monteverdi2 executable does not depend on another shared lib
# Monteverdi_App library
# STATIC so that the monteverdi executable does not depend on another shared lib
# The library is also used in tests, waiting for a better test strategy
# The library is not installed
add_library( Monteverdi2_App