From: Romain Forlot <romain.forlot@iot.bzh>
Date: Mon, 9 Oct 2017 08:45:43 +0000 (+0200)
Subject: Keep libraries and binding in the same directory
X-Git-Tag: 4.99.1
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Ftags%2F4.99.1;p=staging%2Fxdg-launcher.git

Keep libraries and binding in the same directory

Change-Id: I40a3424b689d03e3f6cf471495ed869511a30d2d
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

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 "")