From 1256e7f7f6be950c87e0f4d88d2e0c9a2d4307d0 Mon Sep 17 00:00:00 2001
From: Mattia Mancini <mancini@astron.nl>
Date: Wed, 13 Mar 2019 16:33:40 +0000
Subject: [PATCH] OSB-44: fixing broken build
---
CMake/NPMInstall.cmake | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/CMake/NPMInstall.cmake b/CMake/NPMInstall.cmake
index 907321f1a17..b9aaeda063f 100644
--- a/CMake/NPMInstall.cmake
+++ b/CMake/NPMInstall.cmake
@@ -122,6 +122,11 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
COMMENT "Copying file from ${WEBSITE_SOURCE_DIR}/${file} to ${NPM_BINARY_DIR}/src/${file}")
endforeach(file)
+ add_custom_command(OUTPUT "${NPM_BINARY_DIR}/.env"
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/.env" "${NPM_BINARY_DIR}/.env"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.env"
+ COMMENT "Copying enviroment file")
+
foreach(file ${PUBLIC_FILES})
add_custom_command(OUTPUT "${NPM_BINARY_DIR}/public/${file}"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${WEBSITE_PUBLIC_DIR}/${file}" "${NPM_BINARY_DIR}/public/${file}"
@@ -132,10 +137,10 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
add_custom_target(copy_package_json_${PACKAGE_NAME} SOURCES "${JSON_PACKAGE_SPECIFICATION}")
add_custom_target(download_npm_dependencies_${PACKAGE_NAME} SOURCES "${NPM_BINARY_DIR}/package.json")
add_custom_target(packing_javascript_files_${PACKAGE_NAME} ALL
- SOURCES ${INSTALLED_SOURCE_FILES} ${INSTALLED_PUBLIC_FILES} "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json")
+ SOURCES ${INSTALLED_SOURCE_FILES} ${INSTALLED_PUBLIC_FILES} "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json" ${NPM_BINARY_DIR}/.env)
add_custom_target(start_development_server_${PACKAGE_NAME}
- SOURCES "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json" "${NPM_BINARY_DIR}/package.json"
+ SOURCES "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json" "${NPM_BINARY_DIR}/package.json" ${NPM_BINARY_DIR}/.env
COMMENT "Start start_development_server for ${PACKAGE_NAME}")
--
GitLab