From b4391e0a69e4be6d78436886814f6ea2028d0ef0 Mon Sep 17 00:00:00 2001
From: pathmapper <pathmapper@posteo.de>
Date: Mon, 27 Dec 2021 19:02:56 +0100
Subject: [PATCH] Copy first and build in build directory

---
 .gitignore                                 |  1 -
 resources/CMakeLists.txt                   | 14 +++++++-------
 resources/server/src/landingpage/README.md |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 437af329e5d..e5c11da8998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,6 @@ qgis.supp
 qgis-test.ctest
 qtcreator-build/
 resources/server/api/ogc/static/landingpage
-resources/server/src/landingpage/landingpage.stamp
 resources/server/src/landingpage/node_modules
 resources/themes/*/style.qss.auto
 scripts/astyle.exe
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index c6ec75d94ef..894249dff90 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -35,19 +35,19 @@ if (WITH_SERVER)
 
   # Landingpage
   file(GLOB_RECURSE LANDINGPAGE_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} server/src/landingpage/*)
-  list(REMOVE_ITEM $(LANDINGPAGE_SOURCE_FILES) "*landingpage.stamp")
+  set(LANDINGPAGE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../output/data/resources/server/src/landingpage)
 
-  add_custom_target (yarn-target ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/landingpage.stamp)
+  add_custom_target (yarn-target ALL DEPENDS ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp)
 
   add_custom_command(
     POST_BUILD
-    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/landingpage.stamp
+    OUTPUT ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp
     DEPENDS ${LANDINGPAGE_SOURCE_FILES}
-    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/landingpage.stamp
-    COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage && yarn install --frozen-lockfile && yarn build
     COMMAND ${CMAKE_COMMAND} -E copy_directory
-    ${CMAKE_CURRENT_SOURCE_DIR}/server/api/ogc/static/landingpage/
-    ${CMAKE_CURRENT_BINARY_DIR}/../output/data/resources/server/api/ogc/static/landingpage/
+    ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/
+    ${LANDINGPAGE_OUTPUT_PATH}/
+    COMMAND ${CMAKE_COMMAND} -E touch ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp
+    COMMAND cd ${LANDINGPAGE_OUTPUT_PATH} && yarn install --frozen-lockfile && yarn build
   )
 
 endif()
diff --git a/resources/server/src/landingpage/README.md b/resources/server/src/landingpage/README.md
index 445c0642e4b..3a5158b9339 100644
--- a/resources/server/src/landingpage/README.md
+++ b/resources/server/src/landingpage/README.md
@@ -17,7 +17,7 @@ yarn serve
 yarn build
 ```
 
-Built files location: `resources/server/api/ogc/static/landingpage`
+Built files location: `../../api/ogc/static/landingpage/`
 
 ### Lints and fixes files
 ```