diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-05-24 18:07:15 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-24 18:07:15 +0200 |
| commit | 132404c28f8e2d29605c6f7e5b8d06e0be5a7d42 (patch) | |
| tree | 9335d2fe1b53d7ae07e272b33a8ed6351aea64c8 | |
| parent | 2de0f6ce0d934bad9a80908bbc4a93a837f20eeb (diff) | |
Fix: variable coherence
Change-Id: Ie7c073e0df0e19b31e210cb02d628bde864d11de
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | cmake/common.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/common.cmake b/cmake/common.cmake index 1d43a73..12ef8e8 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -160,7 +160,7 @@ macro(remote_targets_populate) COMMENT "*** Fatal: RSYNC_TARGET RSYNC_PREFIX required with 'make remote-target-populate'" COMMAND exit -1 ) - else() + else() configure_file(${SSH_TEMPLATE_DIR}/start-on-target.in ${CMAKE_CURRENT_BINARY_DIR}/target/start-on-${RSYNC_TARGET}.sh) configure_file(${GDB_TEMPLATE_DIR}/gdb-on-target.in ${CMAKE_CURRENT_BINARY_DIR}/target/gdb-on-${RSYNC_TARGET}.ini) @@ -346,12 +346,12 @@ else() endif() set(PROJECT_PKG_ENTRY_POINT ${CMAKE_SOURCE_DIR}/packaging CACHE PATH "Where package build files, like rpm.spec file or config.xml, are write.") -set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/etc CACHE PATH "Default Package Templates Directory") +set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default CACHE PATH "Default Package Templates Directory") set(SSH_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/ssh) set(GDB_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/gdb) -set(TEMPLATE_WGT_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget") -set(TEMPLATE_RPM_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/rpm" CACHE PATH "Subpath to a directory where are stored needed files to build rpm package") -set(TEMPLATE_DEB_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/deb" CACHE PATH "Subpath to a directory where are stored needed files to build deb package") +set(TEMPLATE_WGT_DIR "${PKG_TEMPLATE_PREFIX}/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget") +set(TEMPLATE_RPM_DIR "${PKG_TEMPLATE_PREFIX}/rpm" CACHE PATH "Subpath to a directory where are stored needed files to build rpm package") +set(TEMPLATE_DEB_DIR "${PKG_TEMPLATE_PREFIX}/deb" CACHE PATH "Subpath to a directory where are stored needed files to build deb package") # Default Linkflag if(NOT BINDINGS_LINK_FLAG) |