From bb1ac35aedee5b587b54ecc0471e81dff1b3dd78 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 2 Sep 2019 12:22:27 +0100 Subject: [PATCH] (Build) Fix Target 64 Bit builds Change-Id: I08e6d43183c871ddb60af45e76507a191d26d219 --- build/tizen/CMakeLists.txt | 6 ++++++ packaging/dali.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index ab85724..4bb2198 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -69,12 +69,18 @@ GET_FILENAME_COMPONENT(ROOT_SRC_DIR ${ROOT_SRC_DIR} ABSOLUTE) # Set up the include dir SET( INCLUDE_DIR $ENV{includedir} ) IF( NOT INCLUDE_DIR ) + SET( INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} ) +ENDIF() +IF( NOT INCLUDE_DIR ) SET( INCLUDE_DIR ${PREFIX}/include ) ENDIF() # Set up the lib dir SET( LIB_DIR $ENV{libdir} ) IF( NOT LIB_DIR ) + SET( LIB_DIR ${CMAKE_INSTALL_LIBDIR} ) +ENDIF() +IF( NOT LIB_DIR ) SET( LIB_DIR ${PREFIX}/lib ) ENDIF() diff --git a/packaging/dali.spec b/packaging/dali.spec index 600e548..5af851c 100644 --- a/packaging/dali.spec +++ b/packaging/dali.spec @@ -82,7 +82,9 @@ cmake \ %if 0%{?enable_trace} -DENABLE_TRACE=ON \ %endif - -DCMAKE_INSTALL_PREFIX=%{_prefix} + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} make %{?jobs:-j%jobs} -- 2.7.4