Skip to content
Snippets Groups Projects
Commit 4a35ad70 authored by Mickael Savinaud's avatar Mickael Savinaud
Browse files

ENH: deactivate the installation of mvd2-viewer

parent b4a8f58e
No related branches found
No related tags found
No related merge requests found
......@@ -105,11 +105,13 @@ target_link_libraries( mvd2-viewer
deploy_qt_conf( mvd2-viewer )
#############################################################################
install(
TARGETS mvd2-viewer
RUNTIME DESTINATION ${Monteverdi2_INSTALL_BIN_DIR} COMPONENT Runtime
LIBRARY DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT Runtime
ARCHIVE DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT Development
)
# mvd2-viewer is not installed
#install(
# TARGETS mvd2-viewer
# RUNTIME DESTINATION ${Monteverdi2_INSTALL_BIN_DIR} COMPONENT Runtime
# LIBRARY DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT Runtime
# ARCHIVE DESTINATION ${Monteverdi2_INSTALL_LIB_DIR} COMPONENT Development
#)
#############################################################################
......@@ -33,7 +33,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "${Monteverdi2_VERSION_PATCH}")
set(CPACK_PACKAGE_CONTACT "contact@orfeo-toolbox.org" CACHE STRING "Orfeo toolbox contact email")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${Monteverdi2_SOURCE_DIR}/Description.txt")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Monteverdi2-${Monteverdi2_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}")
set(CPACK_RESOURCE_FILE_LICENSE "${Monteverdi2_SOURCE_DIR}/Copyright.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${Monteverdi2_SOURCE_DIR}/Copyright/Copyright.txt")
# http://www.vtk.org/Bug/view.php?id=7828
# Need to use the CPACK_PACKAGE_EXECUTABLES
......
include(BundleUtilities)
fixup_bundle("${CMAKE_INSTALL_PREFIX}/bin/mvd2-viewer.exe" "" "")
fixup_bundle("${CMAKE_INSTALL_PREFIX}/bin/monteverdi2.exe" "" "")
\ No newline at end of file
......@@ -3,7 +3,6 @@ set(CPACK_NSIS_MODIFY_PATH ON PARENT_SCOPE)
# Override the monteverdi2.exe
# with the monteverdi2.bat shortcut
set(CPACK_NSIS_MENU_LINKS
"bin/mvd2-viewer.bat" "Monteverdi2 Viewer"
"bin/monteverdi2.bat" "Monteverdi2"
PARENT_SCOPE)
......@@ -12,18 +11,12 @@ set(CPACK_NSIS_MENU_LINKS
# That's why we use the following hack to associate the icon coming from the executable
# to the bat file :
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
"
CreateShortCut \\\"$SMPROGRAMS\\\\Monteverdi2-${Monteverdi2_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}\\\\Monteverdi2 Viewer.lnk\\\" \\\"$INSTDIR\\\\bin\\\\mvd2-viewer.bat\\\" \\\" \\\" \\\"$INSTDIR\\\\bin\\\\mvd2-viewer.exe\\\"
"
"
CreateShortCut \\\"$SMPROGRAMS\\\\Monteverdi2-${Monteverdi2_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}\\\\Monteverdi2.lnk\\\" \\\"$INSTDIR\\\\bin\\\\monteverdi2.bat\\\" \\\" \\\" \\\"$INSTDIR\\\\bin\\\\monteverdi2.exe\\\"
"
PARENT_SCOPE)
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
"
Delete \\\"$SMPROGRAMS\\\\Monteverdi2-${Monteverdi2_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}\\\\Monteverdi2 Viewer.lnk\\\"
"
"
Delete \\\"$SMPROGRAMS\\\\Monteverdi2-${Monteverdi2_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}\\\\Monteverdi2.lnk\\\"
"
......@@ -80,8 +73,7 @@ install(FILES qt.conf
DESTINATION bin
COMPONENT Resources)
install(FILES ${Monteverdi2_SOURCE_DIR}/Packaging/Windows/mvd2-viewer.bat
${Monteverdi2_SOURCE_DIR}/Packaging/Windows/monteverdi2.bat
install(FILES ${Monteverdi2_SOURCE_DIR}/Packaging/Windows/monteverdi2.bat
DESTINATION bin
COMPONENT Runtime)
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Monteverdi launcher to set up proper GDAL environment
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Get the directory of the current script
@set CURRENT_SCRIPT_DIR=%~dp0
:: Set GDAL_DATA env. variable
@set GDAL_DATA=%CURRENT_SCRIPT_DIR%..\share\gdal
:: Set current dir to HOME dir because Monteverdi generates temporary files and need write access
@cd %HOMEDRIVE%%HOMEPATH%
:: Start Monteverdi
@start "Monteverdi" /B "%CURRENT_SCRIPT_DIR%mvd2-viewer.exe" %*
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment