From 6542672145a5d3a2173e62e59ad14b0aa67a5883 Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Wed, 6 Mar 2019 11:05:49 +0100
Subject: [PATCH] webui: move openui5.tar.gz into webdisplay subfolders
Simplify makefiles. In principal, one could use builtins for openui5
sources.
---
CMakeLists.txt | 3 +--
cmake/modules/SearchInstalledSoftware.cmake | 2 +-
{ui5 => gui/webdisplay/res}/openui5.tar.gz | Bin
3 files changed, 2 insertions(+), 3 deletions(-)
rename {ui5 => gui/webdisplay/res}/openui5.tar.gz (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bcf45fc266..067152f0b66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -471,8 +471,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
install(DIRECTORY js/ DESTINATION ${CMAKE_INSTALL_JSROOTDIR})
endif()
if(webui)
- install(DIRECTORY ui5/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR}
- PATTERN "*.tar.gz" EXCLUDE)
+ install(DIRECTORY ui5/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR})
endif()
install(DIRECTORY man/ DESTINATION ${CMAKE_INSTALL_MANDIR})
install(DIRECTORY test/ DESTINATION ${CMAKE_INSTALL_TESTDIR} COMPONENT tests)
diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
index 6ea0cdfb2bb..ed50f042278 100644
--- a/cmake/modules/SearchInstalledSoftware.cmake
+++ b/cmake/modules/SearchInstalledSoftware.cmake
@@ -1473,7 +1473,7 @@ endif()
if(webui)
ExternalProject_Add(
OPENUI5
- URL ${CMAKE_SOURCE_DIR}/ui5/openui5.tar.gz
+ URL ${CMAKE_SOURCE_DIR}/gui/webdisplay/res/openui5.tar.gz
URL_HASH SHA256=a7302c819bbe9c306b9c1c6661d9ea194f01e2fcbb894c32cad60479ed7a3950
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
diff --git a/ui5/openui5.tar.gz b/gui/webdisplay/res/openui5.tar.gz
similarity index 100%
rename from ui5/openui5.tar.gz
rename to gui/webdisplay/res/openui5.tar.gz
--
GitLab