From 86ad29b947f3d6c13a9d4f3fa81f37b637bba138 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Tue, 12 May 2015 21:46:33 +0900 Subject: [PATCH] Fix build error for 64 bits Change-Id: Ibf3d6899e43cc28e32c0af9e02e2e5890a689076 --- widget_provider/CMakeLists.txt | 6 +++--- widget_provider_app/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/widget_provider/CMakeLists.txt b/widget_provider/CMakeLists.txt index 4e856ff..2f30ccb 100644 --- a/widget_provider/CMakeLists.txt +++ b/widget_provider/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(widget_provider C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(PROJECT_NAME "${PROJECT_NAME}") -SET(LIBDIR "\${exec_prefix}/lib") +SET(LIBDIR "\${LIB_INSTALL_DIR}") SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION_MAJOR 1) SET(VERSION "${VERSION_MAJOR}.0.0") @@ -84,8 +84,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${pkgs_extra_LDFLAGS} "-lp CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc") -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}_buffer.h DESTINATION include/${PROJECT_NAME}) diff --git a/widget_provider_app/CMakeLists.txt b/widget_provider_app/CMakeLists.txt index e882b13..2af5c1b 100644 --- a/widget_provider_app/CMakeLists.txt +++ b/widget_provider_app/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(widget_provider_app C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(PROJECT_NAME "${PROJECT_NAME}") -SET(LIBDIR "\${exec_prefix}/lib") +SET(LIBDIR "\${LIB_INSTALL_DIR}") SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION_MAJOR 1) SET(VERSION "${VERSION_MAJOR}.0.0") @@ -91,8 +91,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${app_pkgs_LDFLAGS} ${pkg_extra_LDFLAGS} " CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc") -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}_internal.h DESTINATION include/${PROJECT_NAME}) -- 2.7.4