projects
/
framework
/
osp
/
web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix textarea bug
[framework/osp/web.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
3809b7a
..
bceda8a
100755
(executable)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-9,6
+9,8
@@
INCLUDE_DIRECTORIES(
inc
src
src/controls
inc
src
src/controls
+ src/controls/inc
+
/usr/include/appfw
/usr/include/glib-2.0
/usr/lib/glib-2.0/include
/usr/include/appfw
/usr/include/glib-2.0
/usr/lib/glib-2.0/include
@@
-41,6
+43,7
@@
INCLUDE_DIRECTORIES(
/usr/include/osp/ui
/usr/include/web
/usr/include/vconf
/usr/include/osp/ui
/usr/include/web
/usr/include/vconf
+ /usr/include/media-content
)
SET (${this_target}_SOURCE_FILES
)
SET (${this_target}_SOURCE_FILES
@@
-83,6
+86,10
@@
SET (${this_target}_SOURCE_FILES
src/controls/FWebCtrl_CertificateConfirmPopup.cpp
src/controls/FWebCtrlWebStorageManager.cpp
src/controls/FWebCtrl_WebStorageManagerImpl.cpp
src/controls/FWebCtrl_CertificateConfirmPopup.cpp
src/controls/FWebCtrlWebStorageManager.cpp
src/controls/FWebCtrl_WebStorageManagerImpl.cpp
+ src/controls/FWebCtrl_WebNotification.cpp
+ src/controls/FWebCtrl_WebNotificationHandler.cpp
+ src/controls/FWebCtrl_FormDataWindow.cpp
+ src/controls/FWebCtrl_WebManager.cpp
)
## Add Definitions
ADD_DEFINITIONS(${OSP_DEFINITIONS} -D_MODEL_RES_WVGA)
)
## Add Definitions
ADD_DEFINITIONS(${OSP_DEFINITIONS} -D_MODEL_RES_WVGA)
@@
-110,6
+117,7
@@
TARGET_LINK_LIBRARIES(${this_target} "-losp-image" )
TARGET_LINK_LIBRARIES(${this_target} "-losp-media" )
TARGET_LINK_LIBRARIES(${this_target} "-losp-net" )
TARGET_LINK_LIBRARIES(${this_target} "-lecore" )
TARGET_LINK_LIBRARIES(${this_target} "-losp-media" )
TARGET_LINK_LIBRARIES(${this_target} "-losp-net" )
TARGET_LINK_LIBRARIES(${this_target} "-lecore" )
+TARGET_LINK_LIBRARIES(${this_target} "-lecore_x" )
TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf" )
TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf_evas" )
TARGET_LINK_LIBRARIES(${this_target} "-lelementary" )
TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf" )
TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf_evas" )
TARGET_LINK_LIBRARIES(${this_target} "-lelementary" )
@@
-118,6
+126,7
@@
TARGET_LINK_LIBRARIES(${this_target} "-leina" )
TARGET_LINK_LIBRARIES(${this_target} "-lewebkit2" )
TARGET_LINK_LIBRARIES(${this_target} "-lcapi-web-favorites" )
TARGET_LINK_LIBRARIES(${this_target} "-lcapi-network-connection" )
TARGET_LINK_LIBRARIES(${this_target} "-lewebkit2" )
TARGET_LINK_LIBRARIES(${this_target} "-lcapi-web-favorites" )
TARGET_LINK_LIBRARIES(${this_target} "-lcapi-network-connection" )
+TARGET_LINK_LIBRARIES(${this_target} "-lcapi-content-media-content")
TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
TARGET_LINK_LIBRARIES(${this_target} "-lvconf" )
TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
TARGET_LINK_LIBRARIES(${this_target} "-lvconf" )
@@
-160,6
+169,7
@@
INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/browser-plug
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include/osp FILES_MATCHING PATTERN "*.h")
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include/osp FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/controls/inc/ DESTINATION include/osp/web/controls FILES_MATCHING PATTERN "*.h")
# pkgconfig file
CONFIGURE_FILE(${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
# pkgconfig file
CONFIGURE_FILE(${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)