From 7581bb140e37cb8d80314e32f57d6e8c107aa28c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 18 Feb 2020 14:06:48 +0100
Subject: [PATCH] [CMake] Removed option OGS_DOWNLOAD_ADDITIONAL_CONTENT.
---
CMakeLists.txt | 3 ---
Jenkinsfile | 2 --
scripts/cmake/packaging/Pack.cmake | 28 ----------------------
scripts/cmake/packaging/PackagingWin.cmake | 3 ---
4 files changed, 36 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db02ae460a4..e4ea1fe4107 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -325,9 +325,6 @@ endif()
add_definitions(-DLOGOG_LEVEL=${OGS_LOG_LEVEL})
# Packaging
-option(OGS_DOWNLOAD_ADDITIONAL_CONTENT
- "Should additional content such as manuals be downloaded and packaged?"
- OFF)
include(scripts/cmake/packaging/Pack.cmake)
# ---- Subdirectories ----
diff --git a/Jenkinsfile b/Jenkinsfile
index f495abbbf8e..19c456861de 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -398,7 +398,6 @@ pipeline {
configure { // CLI + GUI
cmakeOptions =
"-DBUILD_SHARED_LIBS=OFF " +
- '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' +
'-DOGS_BUILD_GUI=ON ' +
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_CONAN_BUILD=missing ' +
@@ -456,7 +455,6 @@ pipeline {
cmakeOptions =
"-DBUILD_SHARED_LIBS=${build_shared} " +
'-DOGS_CPU_ARCHITECTURE=core2 ' +
- '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' +
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_BUILD_GUI=ON ' +
'-DOGS_CONAN_BUILD=missing ' +
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index 8fc8ad03e94..306c1662142 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -50,34 +50,6 @@ if(UNIX)
endif()
endif()
-# Download additional content
-if(OGS_DOWNLOAD_ADDITIONAL_CONTENT)
- DownloadAdditionalFilesForPackaging(
- URLS http://docs.opengeosys.org/assets/releases/head/docs/DataExplorer-Manual.pdf
- # http://docs.opengeosys.org/assets/releases/head/docs/User-Manual.pdf
- # http://docs.opengeosys.org/assets/releases/head/docs/Theory-Manual.pdf
- DESTINATION docs
- PACKAGE_GROUP ogs_docs
- )
-
- if(WIN32)
- DownloadAdditionalFilesForPackaging(
- URLS http://docs.opengeosys.org/assets/releases/head/win/OGSFileConverter.exe
- DESTINATION bin
- EXECUTABLE TRUE
- PACKAGE_GROUP ogs_converter
- )
- endif()
- if(APPLE)
- DownloadAdditionalFilesForPackaging(
- URLS http://docs.opengeosys.org/assets/releases/head/mac/OGSFileConverter
- DESTINATION bin
- EXECUTABLE TRUE
- PACKAGE_GROUP ogs_converter
- )
- endif()
-endif()
-
include (CPack)
cpack_add_component_group(Applications
diff --git a/scripts/cmake/packaging/PackagingWin.cmake b/scripts/cmake/packaging/PackagingWin.cmake
index d6efd12dd2b..6a212c7c757 100644
--- a/scripts/cmake/packaging/PackagingWin.cmake
+++ b/scripts/cmake/packaging/PackagingWin.cmake
@@ -15,9 +15,6 @@ set(CPACK_NSIS_MENU_LINKS
"http://www.opengeosys.org" "Website"
"https://github.com/ufz/ogs" "Source code on GitHub"
)
-if(OGS_DOWNLOAD_ADDITIONAL_CONTENT)
- set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "docs" "Documentation folder")
-endif()
if(OGS_USE_CONAN)
file(GLOB MATCHED_FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.dll")
--
GitLab