From: Romain Forlot <romain.forlot@iot.bzh>
Date: Fri, 18 Aug 2017 12:56:39 +0000 (+0200)
Subject: Duplicate variable meant to set installation dir
X-Git-Tag: 4.99.1~48
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=104c34962f734aa1f7bf450b5a82fd148de197e8;p=staging%2Fxdg-launcher.git

Duplicate variable meant to set installation dir

Remove BINDING_INSTALL_PREFIX variable

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

diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index 6d20b2f..7950880 100644
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -119,14 +119,6 @@ endif(kernel_minimal_version)
 
 # Project path variables
 # ----------------------
-
-# If no install dir try to guess some smart default
-if(BINDINGS_INSTALL_PREFIX)
-	set(BINDINGS_INSTALL_DIR ${BINDINGS_INSTALL_PREFIX}/${PROJECT_NAME} CACHE PATH "Where the binding will be installed in your system")
-else()
-	set(BINDINGS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} CACHE PATH "Where the binding will be installed in your system")
-endif()
-
 set(PKGOUT_DIR package CACHE PATH "Output directory for packages")
 
 # Define a default package directory
diff --git a/samples.d/config.cmake.sample b/samples.d/config.cmake.sample
index c979181..810356f 100644
--- a/samples.d/config.cmake.sample
+++ b/samples.d/config.cmake.sample
@@ -144,10 +144,6 @@ set(WIDGET_ENTRY_POINT EntryPoint_Path_Not_Set)
 # -------------------------
 #set(EXTRA_LINK_LIBRARIES)
 
-# Optional force binding installation
-# ------------------------------------
-# set(BINDINGS_INSTALL_PREFIX PrefixPath )
-
 # Optional force binding Linking flag
 # ------------------------------------
 # set(BINDINGS_LINK_FLAG LinkOptions )
diff --git a/template.d/rpm-config.spec.in b/template.d/rpm-config.spec.in
index 8b3d442..34a605d 100644
--- a/template.d/rpm-config.spec.in
+++ b/template.d/rpm-config.spec.in
@@ -42,7 +42,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %setup -q
 
 %build
-%cmake -DBINDINGS_INSTALL_PREFIX:PATH=%{_libdir}
+%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}
 make %{?_smp_mflags}
 
 %install