From 34d456a23d4b32be068264bca2684b0e5ae97e93 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 12 Jan 2015 14:33:23 +0100
Subject: [PATCH] Fixed doc link.
---
Applications/DataExplorer/DataExplorer.cmake | 2 +-
Documentation/OpenGeoSys-Logo.bmp | Bin 79974 -> 88854 bytes
scripts/cmake/packaging/Pack.cmake | 2 +-
scripts/cmake/packaging/PackagingWin.cmake | 5 ++---
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index a63240b4160..f11404fd277 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -156,7 +156,7 @@ cpack_add_component(ogs_gui
GROUP Applications
)
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "DataExplorer" "OGS Data Explorer")
-
+set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/DataExplorer.exe" "Data Explorer" PARENT_SCOPE)
IF(APPLE)
RETURN()
ENDIF()
diff --git a/Documentation/OpenGeoSys-Logo.bmp b/Documentation/OpenGeoSys-Logo.bmp
index c5d2afab475972117a3f14f4b15544161ca4ec47..699e64afccc073cc007ab2c48604003e595687f5 100644
GIT binary patch
delta 56
zcmaF%fo0k@Ruv~-v1mpH5HJH`4G;!$Q-Cxhg9MOdV0aL<QDxcGjR6~!HlLb0XAuBI
CG!4Q4
delta 52
ycmbQXjrG|F78NJoGz&%s5HJH`4G;!$qkuFcg9MOdU@)-QsIqM8=BgcY76AYb*$Wc@
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index 4fd76cfbe40..c32d9503541 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -80,7 +80,7 @@ cpack_add_component(ogs_extras
)
cpack_add_component(ogs_docs
- DISPLAY_NAME "OpenGeosys documentation"
+ DISPLAY_NAME "Documentation"
DESCRIPTION "PDF documentation."
GROUP Utilities
)
diff --git a/scripts/cmake/packaging/PackagingWin.cmake b/scripts/cmake/packaging/PackagingWin.cmake
index b5dc605693a..4c4865c15a5 100644
--- a/scripts/cmake/packaging/PackagingWin.cmake
+++ b/scripts/cmake/packaging/PackagingWin.cmake
@@ -5,13 +5,12 @@ SET(CPACK_PACKAGE_ICON ${BACKGROUND_IMAGE})
SET(CPACK_NSIS_INSTALLED_ICON_NAME ${CPACK_NSIS_MUI_ICON})
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
SET(CPACK_NSIS_CONTACT "info@opengeosys.org")
-SET(CPACK_NSIS_MODIFY_PATH ON)
+SET(CPACK_NSIS_MODIFY_PATH OFF)
SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
SET(CPACK_NSIS_HELP_LINK "http://docs.opengeosys.org/assets/files/Documentation/User_Manual.pdf")
SET(CPACK_NSIS_MENU_LINKS
- "bin/DataExplorer.exe" "Data Explorer"
"bin" "Executables folder"
"http://www.opengeosys.org" "Website"
"https://github.com/ufz/ogs" "Source code on GitHub"
- "http://docs.opengeosys.org" "Documentation"
+ "docs" "Documentation folder"
)
--
GitLab