From 8db3b248406d4a5d0205bcde566e1c51bc6f6f4d Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Mon, 29 Aug 2016 20:19:30 +0000
Subject: [PATCH] Task #8256: Fixed two docker-related issues with the move of
executables to <build-dir>/bin
---
CEP/Pipeline/recipes/sip/CMakeLists.txt | 4 ++--
Docker/CMakeLists.txt | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CEP/Pipeline/recipes/sip/CMakeLists.txt b/CEP/Pipeline/recipes/sip/CMakeLists.txt
index b034415be1d..802c180feba 100644
--- a/CEP/Pipeline/recipes/sip/CMakeLists.txt
+++ b/CEP/Pipeline/recipes/sip/CMakeLists.txt
@@ -139,8 +139,8 @@ foreach(_file pipeline.cfg.CEP4)
# when "all" is build.
add_custom_command(
OUTPUT ${_dst}
- COMMAND ${CMAKE_SOURCE_DIR}/Docker/docker-template -v ${CMAKE_BINARY_DIR}/Docker/versiondocker < ${_src} > ${_dst}
- DEPENDS ${CMAKE_SOURCE_DIR}/Docker/docker-template ${_src} ${CMAKE_BINARY_DIR}/Docker/versiondocker
+ COMMAND ${CMAKE_SOURCE_DIR}/Docker/docker-template -v ${CMAKE_BINARY_DIR}/bin/versiondocker < ${_src} > ${_dst}
+ DEPENDS ${CMAKE_SOURCE_DIR}/Docker/docker-template ${_src} ${CMAKE_BINARY_DIR}/bin/versiondocker
)
add_custom_target(${_file}_target ALL DEPENDS ${_dst})
diff --git a/Docker/CMakeLists.txt b/Docker/CMakeLists.txt
index 8558bb5d9d0..ffcd9ac6b26 100644
--- a/Docker/CMakeLists.txt
+++ b/Docker/CMakeLists.txt
@@ -36,14 +36,14 @@ lofar_add_sbin_scripts(docker-build-all.sh)
foreach(_dir ${DOCKER_TEMPLATE_DIRS})
# _src -> _dst
set(_src ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/Dockerfile.tmpl)
- set(_dst ${CMAKE_CURRENT_BINARY_DIR}/${_dir}_Dockerfile)
+ set(_dst ${CMAKE_BINARY_DIR}/bin/${_dir}_Dockerfile)
# add generating command, and (any) target to force the generation
# when "all" is build.
add_custom_command(
OUTPUT ${_dst}
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docker-template -v ${CMAKE_CURRENT_BINARY_DIR}/versiondocker < ${_src} > ${_dst}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/docker-template ${_src} ${CMAKE_CURRENT_BINARY_DIR}/versiondocker
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docker-template -v ${CMAKE_BINARY_DIR}/bin/versiondocker < ${_src} > ${_dst}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/docker-template ${_src} ${CMAKE_BINARY_DIR}/bin/versiondocker
)
add_custom_target(${_dir}_Dockerfile_target ALL DEPENDS ${_dst})
--
GitLab