From 6d73c83928b67ce90559079fa1e4cbdc64f1d72f Mon Sep 17 00:00:00 2001 From: Changgyu Choi Date: Tue, 11 Jan 2022 17:44:27 +0900 Subject: [PATCH] Fix 64bit build error Change-Id: I885fb14b0a9231c29dde7f7a841efcb3eb1053a1 Signed-off-by: Changgyu Choi --- tizen-cpp/app-core-cpp/CMakeLists.txt | 2 +- tizen-cpp/app-core-efl-cpp/CMakeLists.txt | 2 +- tizen-cpp/app-core-multi-window-cpp/CMakeLists.txt | 2 +- unittests/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tizen-cpp/app-core-cpp/CMakeLists.txt b/tizen-cpp/app-core-cpp/CMakeLists.txt index 20fc2e6..9668ed4 100644 --- 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 a7c3b03..4258031 100644 --- 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 3285e7d..3cf26f2 100644 --- 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 8940982..72d1744 100644 --- 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") -- 2.7.4