Build: Fix loading path of vulkan-wsi-tizen.so on vulkan-wsi-tizen.json

 - before: it loads from /usr/lib/vulkan/vulkan-wsi-tizen.so
 - after : 32bit case; /usr/lib/vulkan/vulkan-wsi-tizen.so
           64bit case; /usr/lib64/vulkan/vulkan-wsi-tizen.so

Change-Id: Ibcc13231d216e9c2e892cf2045d54af52803338b
Signed-off-by: Mun, Gwan-gyeong <kk.moon@samsung.com>

diff --git a/.gitignore b/.gitignore
index 3ea488a..a641901 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.so
 *.pc
 *.in
+!*.json.in
 !*.pc.in
 aclocal.m4
 autom4te.cache/

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1656097
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,21 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(vulkan-wsi-tizen C)
+
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(BUILD_ARCH "$ENV{RPM_ARCH}")
+
+IF(${BUILD_ARCH} MATCHES "aarch64")
+SET(LIB "lib64")
+SET(LIBDIR "/usr/lib64")
+ELSEIF(${BUILD_ARCH} MATCHES "x86_64")
+SET(LIB "lib64")
+SET(LIBDIR "/usr/lib64")
+ELSE(${BUILD_ARCH} MATCHES "aarch64")
+SET(LIB "lib")
+SET(LIBDIR "/usr/lib")
+ENDIF(${BUILD_ARCH} MATCHES "aarch64")
+
+#################################################################
+# Build Package Config File
+# ------------------------------
+CONFIGURE_FILE(src/wsi/vulkan-wsi-tizen.json.in src/wsi/vulkan-wsi-tizen.json @ONLY)

diff --git a/packaging/vulkan-wsi-tizen.spec b/packaging/vulkan-wsi-tizen.spec
index 48fd3af..a622c01 100644 (file)
--- a/packaging/vulkan-wsi-tizen.spec
+++ b/packaging/vulkan-wsi-tizen.spec
@@ -11,6 +11,7 @@ BuildRequires: autoconf > 2.64
 BuildRequires: automake >= 1.11
 BuildRequires: libtool >= 2.2
 
+BuildRequires: cmake
 BuildRequires: pkgconfig(tpl-egl)
 BuildRequires: pkgconfig(libtbm)
 BuildRequires: Vulkan-LoaderAndValidationLayers
@@ -41,6 +42,7 @@ Development packages for tizen vulkan driver
 %setup -q
 
 %build
+cmake . -DCMAKE_INSTALL_PREFIX=/usr
 %autogen
 make %{?_smp_mflags}
 

diff --git a/src/wsi/vulkan-wsi-tizen.json b/src/wsi/vulkan-wsi-tizen.json.in
similarity index 58%
rename from src/wsi/vulkan-wsi-tizen.json
rename to src/wsi/vulkan-wsi-tizen.json.in
index c5669de..e6ce603 100644 (file)
--- a/src/wsi/vulkan-wsi-tizen.json
+++ b/src/wsi/vulkan-wsi-tizen.json.in
@@ -1,7 +1,7 @@
 {
     "file_format_version": "1.0.0",
     "ICD": {
-        "library_path": "/usr/lib/vulkan/vulkan-wsi-tizen.so",
+        "library_path": "/usr/@LIB@/vulkan/vulkan-wsi-tizen.so",
         "api_version": "1.0.1"
     }
 }