X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=ba70414258edb2ee9a287a8c966de38997edc9a5;hb=HEAD;hp=3097d3289b5dfd1f3d1b0ce40bd6f6b420aad68e;hpb=78184fd6ccac6c8e7f210f017e766f210d87e0f2;p=platform%2Fframework%2Fweb%2Fwrt.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3097d32..ba70414 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,12 +46,22 @@ OPTION(CSP_SUPPORT "Support for csp policy" ON) OPTION(ALLOW_NAVIGATION_SUPPORT "Support for allow-navigation" ON) OPTION(APP_SCHEME_SUPPORT "Support for app:// scheme" OFF) OPTION(CORS_WHITELISTING_SUPPORT "CORS white listing for access positions" OFF) -OPTION(MULTIPROCESS_SERVICE_SUPPORT "Process per service" OFF) -OPTION(MULTIPROCESS_SERVICE_SUPPORT_INLINE "Process per service - inline mode support" OFF) OPTION(DECRYPT_SUPPORT "Enable appmanager capabilities" ON) +OPTION(MULTI_USER_SUPPORT "Enable multi-user support" OFF) + +IF(MULTI_USER_SUPPORT) + ADD_DEFINITIONS("-DMULTI_USER_SUPPORT") +ELSE() + ADD_DEFINITIONS("-DDAC_ACTIVATE") +ENDIF(MULTI_USER_SUPPORT) + IF(DECRYPT_SUPPORT) ADD_DEFINITIONS("-DDECRYPT") ENDIF(DECRYPT_SUPPORT) +OPTION(X11_SUPPORT "Enable X11" ON) +IF(X11_SUPPORT) + ADD_DEFINITIONS("-DX11") +ENDIF(X11_SUPPORT) IF(CSP_SUPPORT) ADD_DEFINITIONS("-DCSP_ENABLED") ENDIF(CSP_SUPPORT) @@ -64,12 +74,6 @@ ENDIF(APP_SCHEME_SUPPORT) IF(CORS_WHITELISTING_SUPPORT) ADD_DEFINITIONS("-DCORS_WHITELISTING_ENABLED") ENDIF(CORS_WHITELISTING_SUPPORT) -IF(MULTIPROCESS_SERVICE_SUPPORT) - ADD_DEFINITIONS("-DMULTIPROCESS_SERVICE_SUPPORT") - IF (MULTIPROCESS_SERVICE_SUPPORT_INLINE) - ADD_DEFINITIONS("-DMULTIPROCESS_SERVICE_SUPPORT_INLINE") - ENDIF(MULTIPROCESS_SERVICE_SUPPORT_INLINE) -ENDIF(MULTIPROCESS_SERVICE_SUPPORT) # logs can be only enabled in debug mode IF(CMAKE_BUILD_TYPE MATCHES "Profiling" AND DPL_LOG) MESSAGE(STATUS "Logging disabled for DPL") @@ -100,7 +104,11 @@ SET(CMAKE_CXX_FLAGS_CCOV "-O0 -std=c++0x -g --coverage") ADD_DEFINITIONS("-fPIC") # If supported for the target machine, emit position-independent code, suitable for dynamic linking and avoiding any limit on the size of the global offset table. This option makes a difference on the m68k, PowerPC and SPARC. (BJ: our ARM too?) #ADD_DEFINITIONS("-fvisibility=hidden") # Set the default ELF image symbol visibility to hidden - all symbols will be marked with this unless overridden within the code. -ADD_DEFINITIONS("-fPIE") + +# We should be building with position independent code, but something +# about the mismatch of various flags ends up breaking the build on +# x64_64 architectues. This issues is being tracked with TZIVI-1185 +#ADD_DEFINITIONS("-fPIE") ADD_DEFINITIONS("-DLIBDIR_PREFIX=\"${LIB_INSTALL_DIR}\"") @@ -156,114 +164,81 @@ SET(TARGET_TESTS_COMMON_LIB "wrt-engine-tests-lib") #tests only SET(TARGET_PROFILING_LIB "wrt-profiling") SET(TARGET_PLUGIN_MODULE_LIB "wrt-plugin-module") SET(TARGET_VIEW_MODULE_LIB "wrt-view-module") +SET(TARGET_VIEW_COMMON_LIB_STATIC "wrt-view-common") SET(TARGET_CORE_MODULE_LIB "wrt-core-module") SET(TARGET_INJECTED_BUNDLE_LIB "wrt-injected-bundle") - SET(PROF_LIB "") IF(PROFILING) SET(PROF_LIB ${TARGET_PROFILING_LIB}) ENDIF(PROFILING) -INSTALL(FILES - ${PROJECT_SOURCE_DIR}/wrt_reset_db.sh - ${PROJECT_SOURCE_DIR}/wrt_reset_all.sh - DESTINATION /usr/bin/ - ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/warp_security_error.msg - DESTINATION /usr/etc/wrt/ - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE - ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/parental.png - DESTINATION /usr/etc/wrt/ - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE - ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/default_icon_tizen.png - DESTINATION share/wrt-engine/ - ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/default_icon_wac.png - DESTINATION share/wrt-engine/ - ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/userAgentProfile.xml - DESTINATION share/wrt-engine/ - ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/WAC2.0TestRootCA.cert - DESTINATION share/wrt-engine/ - ) -ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_SOURCE_DIR}/data/wrt_theme.edj - COMMAND edje_cc -id ${PROJECT_SOURCE_DIR}/data/images - ARGS ${PROJECT_SOURCE_DIR}/data/wrt_theme.edc - ${PROJECT_SOURCE_DIR}/data/wrt_theme.edj - DEPENDS ${PROJECT_SOURCE_DIR}/data/wrt_theme.edc - ) -ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_SOURCE_DIR}/data/Daemon.edj - COMMAND edje_cc - ARGS ${PROJECT_SOURCE_DIR}/data/Daemon.edc - ${PROJECT_SOURCE_DIR}/data/Daemon.edj - DEPENDS ${PROJECT_SOURCE_DIR}/data/Daemon.edc - ) +############################# +# definitions +ADD_DEFINITIONS("-DWRT_EDJ_PATH=\"/usr/share/edje/wrt/Wrt.edj\"") + +############################# +# edc build ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_SOURCE_DIR}/data/Platform.edj + OUTPUT ${PROJECT_SOURCE_DIR}/data/Wrt.edj COMMAND edje_cc - ARGS ${PROJECT_SOURCE_DIR}/data/Platform.edc - ${PROJECT_SOURCE_DIR}/data/Platform.edj - DEPENDS ${PROJECT_SOURCE_DIR}/data/Platform.edc - ) -ADD_CUSTOM_TARGET( WRT_THEME_EDJES ALL DEPENDS - ${PROJECT_SOURCE_DIR}/data/wrt_theme.edj - ) -ADD_CUSTOM_TARGET( WRT_EDJES ALL DEPENDS - ${PROJECT_SOURCE_DIR}/data/Daemon.edj - ) -ADD_CUSTOM_TARGET( WRT_PLATFORM_LAYOUT_EDJES ALL DEPENDS - ${PROJECT_SOURCE_DIR}/data/Platform.edj - ) + ARGS ${PROJECT_SOURCE_DIR}/data/Wrt.edc + ${PROJECT_SOURCE_DIR}/data/Wrt.edj + DEPENDS ${PROJECT_SOURCE_DIR}/data/Wrt.edc +) +ADD_CUSTOM_TARGET(WRT_EDJE ALL + DEPENDS ${PROJECT_SOURCE_DIR}/data/Wrt.edj +) + ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/data/generic_popup.edj COMMAND edje_cc ARGS ${PROJECT_SOURCE_DIR}/data/generic_popup.edc ${PROJECT_SOURCE_DIR}/data/generic_popup.edj DEPENDS ${PROJECT_SOURCE_DIR}/data/generic_popup.edc - ) -ADD_CUSTOM_TARGET(generic_popup ALL DEPENDS - ${PROJECT_SOURCE_DIR}/data/generic_popup.edj - ) -INSTALL(FILES ${PROJECT_SOURCE_DIR}/data/generic_popup.edj - DESTINATION share/edje/ace/ - ) -INSTALL(FILES ${PROJECT_SOURCE_DIR}/data/wrt_theme.edj - DESTINATION share/edje/wrt/ - ) -INSTALL(FILES ${PROJECT_SOURCE_DIR}/data/Daemon.edj - DESTINATION share/edje/wrt/ - ) -INSTALL(FILES ${PROJECT_SOURCE_DIR}/data/Platform.edj - DESTINATION share/edje/wrt/ - ) +) +ADD_CUSTOM_TARGET(WRT_GENERIC_POPUP_EDJE ALL + DEPENDS ${PROJECT_SOURCE_DIR}/data/generic_popup.edj +) + ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/data/generic_popup_horizontal.edj COMMAND edje_cc ARGS ${PROJECT_SOURCE_DIR}/data/generic_popup_horizontal.edc ${PROJECT_SOURCE_DIR}/data/generic_popup_horizontal.edj DEPENDS ${PROJECT_SOURCE_DIR}/data/generic_popup_horizontal.edc - ) -ADD_CUSTOM_TARGET(generic_popup_horizontal ALL DEPENDS +) +ADD_CUSTOM_TARGET(WRT_GENERIC_POPUP_HORIZONTAL_EDJE ALL + DEPENDS ${PROJECT_SOURCE_DIR}/data/generic_popup_horizontal.edj +) + +############################# +# install +INSTALL(FILES + ${PROJECT_SOURCE_DIR}/wrt_reset_db.sh + ${PROJECT_SOURCE_DIR}/wrt_reset_all.sh + DESTINATION /usr/bin/ +) +INSTALL(FILES + ${PROJECT_SOURCE_DIR}/data/Wrt.edj + DESTINATION share/edje/wrt/ +) +INSTALL(FILES + ${PROJECT_SOURCE_DIR}/data/generic_popup.edj ${PROJECT_SOURCE_DIR}/data/generic_popup_horizontal.edj - ) -INSTALL(FILES ${PROJECT_SOURCE_DIR}/data/generic_popup_horizontal.edj DESTINATION share/edje/ace/ - ) +) + +############################# +# install launchpad files INSTALL(FILES ${CMAKE_SOURCE_DIR}/wrt_env.sh DESTINATION /etc/profile.d/ - ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/wrt_launchpad_daemon.rule - DESTINATION /etc/smack/accesses2.d/ - ) -# temp for smack branch -INSTALL(FILES ${CMAKE_SOURCE_DIR}/accesses.d/wrt_launchpad_daemon.rule - DESTINATION /opt/etc/smack/accesses.d/ - ) +) +INSTALL(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/systemd/wrt_launchpad_daemon@.service + ${CMAKE_CURRENT_SOURCE_DIR}/systemd/wrt_launchpad_daemon_1.socket + ${CMAKE_CURRENT_SOURCE_DIR}/systemd/wrt_launchpad_daemon_2.socket + DESTINATION /usr/lib/systemd/system/ +) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(po) @@ -282,5 +257,3 @@ INSTALL(FILES ${PKGCONFIG_DIR}/wrt-core.pc DESTINATION ${LIB_INSTALL_DIR}/pkgcon IF(WITH_TESTS) add_subdirectory(tests) ENDIF(WITH_TESTS) - -