projects
/
framework
/
web
/
wrt-commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tizen 2.0 Release
[framework/web/wrt-commons.git]
/
build
/
dbus
/
CMakeLists.txt
diff --git
a/build/dbus/CMakeLists.txt
b/build/dbus/CMakeLists.txt
index
71e883a
..
59b2db1
100644
(file)
--- a/
build/dbus/CMakeLists.txt
+++ b/
build/dbus/CMakeLists.txt
@@
-22,6
+22,7
@@
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(SYS_EFL_DBUS
dbus-1
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(SYS_EFL_DBUS
dbus-1
+ gio-2.0
REQUIRED)
# Add core include directories
REQUIRED)
# Add core include directories
@@
-30,7
+31,10
@@
INCLUDE_DIRECTORIES(
${DPL_CORE_INCLUDE_DIR}
${DPL_DBUS_INCLUDE_DIR}
${DPL_EVENT_INCLUDE_DIR}
${DPL_CORE_INCLUDE_DIR}
${DPL_DBUS_INCLUDE_DIR}
${DPL_EVENT_INCLUDE_DIR}
- ${SYS_EFL_INCLUDE_DIRS})
+)
+
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_DBUS_INCLUDE_DIRS})
LINK_DIRECTORIES(
${SYS_EFL_DBUS_LIBRARY_DIRS}
LINK_DIRECTORIES(
${SYS_EFL_DBUS_LIBRARY_DIRS}
@@
-51,19
+55,18
@@
TARGET_LINK_LIBRARIES(${TARGET_DPL_DBUS_EFL}
# Target library properties
SET_TARGET_PROPERTIES(${TARGET_DPL_DBUS_EFL} PROPERTIES
# Target library properties
SET_TARGET_PROPERTIES(${TARGET_DPL_DBUS_EFL} PROPERTIES
- SOVERSION ${VERSION}
+ SOVERSION ${API_VERSION}
+ VERSION ${VERSION}
CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME ${DPL_EFL_DBUS_LIBRARY})
# Install libraries
INSTALL(TARGETS ${TARGET_DPL_DBUS_EFL}
CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME ${DPL_EFL_DBUS_LIBRARY})
# Install libraries
INSTALL(TARGETS ${TARGET_DPL_DBUS_EFL}
- DESTINATION lib
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ DESTINATION lib)
# Install detail headers
INSTALL(FILES ${DPL_DBUS_HEADERS}
DESTINATION include/dpl-efl/dpl/dbus)
# Install pkgconfig script
# Install detail headers
INSTALL(FILES ${DPL_DBUS_HEADERS}
DESTINATION include/dpl-efl/dpl/dbus)
# Install pkgconfig script
-INSTALL(FILES dpl-dbus-efl.pc
- DESTINATION lib/pkgconfig)
+configure_and_install_pkg(dpl-dbus-efl.pc)