From: Sangjung Woo Date: Thu, 29 Sep 2016 06:49:50 +0000 (+0900) Subject: pkgconfig: fix pkgconfig error X-Git-Tag: accepted/tizen/3.0/ivi/20161011.053519^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4d7462d115a7a90c463d2e05490604deb221a28;p=profile%2Fivi%2Fautomotive-message-broker.git pkgconfig: fix pkgconfig error Current Tizen uses json-c instead of json. However, automotive-message-broker.pc requires 'json' so error occurs when building ABM plugin. And Tizen build system gives 'INCLUDE_INSTALL_DIR' but AMB overwrites this variable without checking its existence. This patch fixes these bugs. Change-Id: I5c920cceff2bc96df4e0efd58824ef7541f5ef39 Signed-off-by: Sangjung Woo --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eda6d3..36ce973 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,9 @@ add_definitions(-DPROJECT_SERIES="${PROJECT_SERIES}") set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) set (PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}") -set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") +if (NOT DEFINED INCLUDE_INSTALL_DIR) + set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") +endif() set (DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}/${PROJECT_NAME}/${PROJECT_SERIES}") set (PLUGIN_SEGMENT_INSTALL_PATH "${CMAKE_INSTALL_SYSCONFDIR}/ambd/plugins.d") diff --git a/lib/automotive-message-broker.pc.in b/lib/automotive-message-broker.pc.in index 2602b31..14c4ece 100644 --- a/lib/automotive-message-broker.pc.in +++ b/lib/automotive-message-broker.pc.in @@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@/amb Name: automotive-message-broker Description: Message Broker for vehicle data Version: @PROJECT_VERSION@ -Requires: gio-2.0 glib-2.0 json +Requires: gio-2.0 glib-2.0 json-c Libs: -L${libdir} -lamb -luuid Cflags: -I${includedir}