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
/
core
/
CMakeLists.txt
diff --git
a/build/core/CMakeLists.txt
b/build/core/CMakeLists.txt
index
a6dc980
..
080d65c
100644
(file)
--- a/
build/core/CMakeLists.txt
+++ b/
build/core/CMakeLists.txt
@@
-35,9
+35,10
@@
INCLUDE_DIRECTORIES(
${DPL_LOG_INCLUDE_DIR}
${DPL_CORE_INCLUDE_DIR}
${DPL_3RDPARTY_INCLUDE_DIR}
${DPL_LOG_INCLUDE_DIR}
${DPL_CORE_INCLUDE_DIR}
${DPL_3RDPARTY_INCLUDE_DIR}
- ${SYS_EFL_INCLUDE_DIRS}
)
)
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_INCLUDE_DIRS})
+
LINK_DIRECTORIES(${SYS_EFL_LIBRARY_DIRS})
# Base EFL based DPL library
LINK_DIRECTORIES(${SYS_EFL_LIBRARY_DIRS})
# Base EFL based DPL library
@@
-58,14
+59,14
@@
TARGET_LINK_LIBRARIES(${TARGET_DPL_EFL} lib3rdparty)
# Target library properties
SET_TARGET_PROPERTIES(${TARGET_DPL_EFL} PROPERTIES
# Target library properties
SET_TARGET_PROPERTIES(${TARGET_DPL_EFL} PROPERTIES
- SOVERSION ${VERSION}
+ SOVERSION ${API_VERSION}
+ VERSION ${VERSION}
CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME ${DPL_EFL_LIBRARY})
# Install libraries
INSTALL(TARGETS ${TARGET_DPL_EFL}
CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME ${DPL_EFL_LIBRARY})
# Install libraries
INSTALL(TARGETS ${TARGET_DPL_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_CORE_EFL_DETAIL_HEADERS}
# Install detail headers
INSTALL(FILES ${DPL_CORE_EFL_DETAIL_HEADERS}
@@
-84,5
+85,4
@@
INSTALL(FILES ${DPL_3RDPARTY_HEADERS}
DESTINATION include/dpl-efl/dpl/3rdparty/fastdelegate)
# Install pkgconfig script
DESTINATION include/dpl-efl/dpl/3rdparty/fastdelegate)
# Install pkgconfig script
-INSTALL(FILES dpl-efl.pc
- DESTINATION lib/pkgconfig)
+configure_and_install_pkg(dpl-efl.pc)