aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-10-09 10:45:43 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-10-09 10:45:43 +0200
commit17456de19e50f63348d42c4ae26dda156ddec53d (patch)
tree756c98a833f74f16729b26db967ec78625422059 /cmake
parent8a77e99d6814db9918cf266a3b9a36f10622d60b (diff)
Keep libraries and binding in the same directoryeel_4.99.1eel/4.99.14.99.1
Change-Id: I40a3424b689d03e3f6cf471495ed869511a30d2d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cmake.d/03-macros.cmake8
1 files changed, 3 insertions, 5 deletions
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 6f93c37..3602aa8 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -258,13 +258,11 @@ endmacro()
# Pre-packaging
macro(project_targets_populate)
# Default Widget default directory
- set(AFBDIR afb)
set(BINDIR bin)
set(ETCDIR etc)
set(LIBDIR lib)
set(HTTPDIR htdocs)
set(DATADIR data)
- set(PACKAGE_AFBDIR ${PROJECT_PKG_BUILD_DIR}/${AFBDIR})
set(PACKAGE_BINDIR ${PROJECT_PKG_BUILD_DIR}/${BINDIR})
set(PACKAGE_ETCDIR ${PROJECT_PKG_BUILD_DIR}/${ETCDIR})
set(PACKAGE_LIBDIR ${PROJECT_PKG_BUILD_DIR}/${LIBDIR})
@@ -317,19 +315,19 @@ macro(project_targets_populate)
if(NOT S)
set(S ".ctlso")
endif()
- generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_AFBDIR}/plugins")
+ generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_LIBDIR}/plugins")
elseif(${T} STREQUAL "BINDING")
if(NOT S)
set(S ".so")
endif()
list(APPEND BINDINGS_LIST "${P}${OUT}${S}")
- generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_AFBDIR})
+ generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
elseif(${T} STREQUAL "BINDINGV2")
if(NOT S)
set(S ".so")
endif()
afb_genskel()
- generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_AFBDIR})
+ generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
elseif(${T} STREQUAL "EXECUTABLE")
if(NOT S)
set(S "")