From ceff1f18bf7e8f1a3ecfc9f3f081b9a7acc42134 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 6 Feb 2017 22:21:28 +0100
Subject: [PATCH] [CMake] Output converted vtk.js into sources/web.
---
scripts/cmake/test/AddTest.cmake | 1 +
scripts/cmake/test/AddTestTester.cmake | 5 ++++-
web/.gitignore | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 5a1c83c2330..7db72f04a24 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -217,6 +217,7 @@ function (AddTest)
-DTESTER_COMMAND=${TESTER_COMMAND}
-DVTKJS_CONVERTER=${VTKJS_CONVERTER}
-DBINARY_PATH=${AddTest_BINARY_PATH}
+ -DVTKJS_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/web/static/vis/${AddTest_PATH}
"-DVIS_FILES=${AddTest_VIS}"
-P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestTester.cmake
)
diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake
index 6fdd3472fec..551287479c3 100644
--- a/scripts/cmake/test/AddTestTester.cmake
+++ b/scripts/cmake/test/AddTestTester.cmake
@@ -19,8 +19,11 @@ if(NOT EXIT_CODE STREQUAL "0")
endif()
# Run vtk.js converter
+if(VIS_FILES)
+ execute_process(COMMAND cmake -E make_directory ${VTKJS_OUTPUT_PATH})
+endif()
foreach(FILE ${VIS_FILES})
execute_process(
- COMMAND ${VTKJS_CONVERTER} -e -i ${BINARY_PATH}/${FILE} -o ${BINARY_PATH}/vtk-js
+ COMMAND ${VTKJS_CONVERTER} -e -i ${BINARY_PATH}/${FILE} -o ${VTKJS_OUTPUT_PATH}
)
endforeach()
diff --git a/web/.gitignore b/web/.gitignore
index 46b8fa94a6f..4b6bd93e07e 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -4,6 +4,9 @@ bin/
public/
themes/ogs/static
import/secret.py
+static/
+test.md
+test.jpg
# Generated from Contentful
content/internal
--
GitLab