Fix 64bit build error

Change-Id: I885fb14b0a9231c29dde7f7a841efcb3eb1053a1
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/tizen-cpp/app-core-cpp/CMakeLists.txt b/tizen-cpp/app-core-cpp/CMakeLists.txt
index 20fc2e61e060cbecfd5f9bc4c13dd1ad46d3e20f..9668ed42a6df61c3487d219fda985d668dea9a84 100644 (file)
--- a/tizen-cpp/app-core-cpp/CMakeLists.txt
+++ b/tizen-cpp/app-core-cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_CORE_CPP} PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../)
 
-TARGET_LINK_LIBRARIES(${TARGET_APP_CORE_CPP} PUBLIC "-ldl -L/usr/lib/hal")
+TARGET_LINK_LIBRARIES(${TARGET_APP_CORE_CPP} PUBLIC "-ldl -L${LIB_INSTALL_DIR}/hal")
 SET_TARGET_PROPERTIES(${TARGET_APP_CORE_CPP} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${TARGET_APP_CORE_CPP} PROPERTIES VERSION ${FULLVER})
 

diff --git a/tizen-cpp/app-core-efl-cpp/CMakeLists.txt b/tizen-cpp/app-core-efl-cpp/CMakeLists.txt
index a7c3b03f6e100213974c1d2ddc9c886fa331495c..425803197d274864606a4cff171f396a9d0cfbd1 100644 (file)
--- a/tizen-cpp/app-core-efl-cpp/CMakeLists.txt
+++ b/tizen-cpp/app-core-efl-cpp/CMakeLists.txt
@@ -12,7 +12,7 @@ TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_CORE_EFL_CPP} PUBLIC
 TARGET_LINK_LIBRARIES(${TARGET_APP_CORE_EFL_CPP} PUBLIC
   ${TARGET_APP_CORE_UI_CPP}
   ${TARGET_APP_CORE_CPP}
-  "-L/usr/lib/hal")
+  "-L${LIB_INSTALL_DIR}/hal")
 
 SET_TARGET_PROPERTIES(${TARGET_APP_CORE_EFL_CPP}
   PROPERTIES SOVERSION ${MAJORVER})

diff --git a/tizen-cpp/app-core-multi-window-cpp/CMakeLists.txt b/tizen-cpp/app-core-multi-window-cpp/CMakeLists.txt
index 3285e7db6408b3cf41258d78d40654ca803a9843..3cf26f299668b46a47bf6f68a590ca1531993f7a 100644 (file)
--- a/tizen-cpp/app-core-multi-window-cpp/CMakeLists.txt
+++ b/tizen-cpp/app-core-multi-window-cpp/CMakeLists.txt
@@ -13,7 +13,7 @@ TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_CORE_MULTI_WINDOW_CPP} PUBLIC
 
 TARGET_LINK_LIBRARIES(${TARGET_APP_CORE_MULTI_WINDOW_CPP} PUBLIC
   ${TARGET_APP_CORE_CPP}
-  "-L/usr/lib/hal")
+  "-L${LIB_INSTALL_DIR}/hal")
 
 SET_TARGET_PROPERTIES(${TARGET_APP_CORE_MULTI_WINDOW_CPP}
   PROPERTIES SOVERSION ${MAJORVER})

diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 89409823a200533fedccc207dfcbca969bd7be44..72d17442c8f3453938c8b1663f58a53c5425a07f 100644 (file)
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -50,6 +50,6 @@ APPLY_PKG_CONFIG(${TARGET_UNIT_TEST} PUBLIC
   WAYLAND_CLIENT_DEPS
 )
 
-TARGET_LINK_LIBRARIES(${TARGET_UNIT_TEST} PUBLIC "-L/usr/lib/hal")
+TARGET_LINK_LIBRARIES(${TARGET_UNIT_TEST} PUBLIC "-L${LIB_INSTALL_DIR}/hal")
 SET_TARGET_PROPERTIES(${TARGET_UNIT_TEST} PROPERTIES COMPILE_FLAGS "-fPIE")
 SET_TARGET_PROPERTIES(${TARGET_UNIT_TEST} PROPERTIES LINK_FLAGS "-pie")