From ac9a7e0e6ed6bf2506a321bcc243c75e96c2acac Mon Sep 17 00:00:00 2001 From: Michael Leibowitz Date: Tue, 8 Oct 2013 17:26:32 -0700 Subject: [PATCH] fix x86_64 build switch from using lib in destination to ${LIB_INSTALL_DIR} Change-Id: I4c1ea98a25db357c6196cd7ab2fd820e64d9f426 Signed-off-by: Michael Leibowitz --- client/CMakeLists.txt | 4 ++-- common/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 2fbe8a8..cf5ab28 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -23,9 +23,9 @@ FILE(GLOB CLIENT_HEADER include/*.h) SET(CLIENT_HEADER ${CLIENT_HEADER} ${CMAKE_SOURCE_DIR}/common/include/net_nfc_typedef.h) CONFIGURE_FILE(${NFC_CLIENT}.pc.in ${NFC_CLIENT}.pc @ONLY) -INSTALL(FILES ${NFC_CLIENT}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${NFC_CLIENT}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(TARGETS ${NFC_CLIENT} DESTINATION lib) +INSTALL(TARGETS ${NFC_CLIENT} DESTINATION ${LIB_INSTALL_DIR}) FOREACH(hfile ${CLIENT_HEADER}) INSTALL(FILES ${hfile} DESTINATION include/${NFC_CLIENT}) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index bc7510d..978b0ec 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -26,7 +26,7 @@ TARGET_LINK_LIBRARIES(${NFC_COMMON} ${common_pkgs_LDFLAGS}) FILE(GLOB COMMON_HEADER include/*.h) CONFIGURE_FILE(${NFC_COMMON}.pc.in ${NFC_COMMON}.pc @ONLY) -INSTALL(FILES ${NFC_COMMON}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${NFC_COMMON}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) FOREACH(hfile ${COMMON_HEADER}) INSTALL(FILES ${hfile} DESTINATION include/${NFC_COMMON}) -- 2.7.4