Commit 7ea4f5e5 authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

cmake: use new CMake script to build notebooks

Former-commit-id: d5681b34
parent 226c7119
......@@ -31,11 +31,15 @@ docker:
build:linux:
stage: build
script:
- mkdir build
- mkdir -p build
- cd build
- cmake ..
- make -j 32
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
cache:
paths:
- build
key: build-linux
artifacts:
paths:
- build
......@@ -147,8 +151,12 @@ deploy:packages:
test:jupyter:
stage: test
script:
- make -C Examples/Notebooks
- cd build
- cmake ..
- make -j32 notebooks
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}
dependencies:
- build:linux
artifacts:
paths:
- build/Examples/Notebooks/
......
......@@ -25,6 +25,8 @@ if(WITH_PYTHON AND JUPYTER)
set(HTML "${CMAKE_CURRENT_BINARY_DIR}/${DIR}/${NAME}.html")
add_custom_command(
COMMAND
${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${DIR}
COMMAND
${CMAKE_COMMAND} -E env PYTHONPATH=${PYTHONPATH}
${JUPYTER} nbconvert
......@@ -32,7 +34,6 @@ if(WITH_PYTHON AND JUPYTER)
--output-dir ${CMAKE_CURRENT_BINARY_DIR}/${DIR}
"${CMAKE_CURRENT_SOURCE_DIR}/${IPYNB}"
OUTPUT "${HTML}"
WORKING_DIRECTORY ${DIR}
DEPENDS
"${IPYNB}"
dpsim_python
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment