[AT-SPI] Add ENABLE_ATSPI option to CMake

Change-Id: I79909f2e2bda8af61fa7f07ee8721e42c12e460b

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index e146005..2ec67bd 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -17,6 +17,7 @@ ENDIF()
 
 OPTION(ENABLE_PKG_CONFIGURE  "Use pkgconfig" ON)
 OPTION(ENABLE_LINK_TEST      "Enable the link test" ON)
+OPTION(ENABLE_ATSPI          "Enable AT-SPI accessibility" OFF)
 
 # Include additional macros
 INCLUDE( common.cmake )
@@ -135,6 +136,12 @@ INCLUDE( module-list.cmake )
 # Include profile specific setup
 INCLUDE( profiles/${PROFILE_LCASE}-profile.cmake )
 
+IF ( ENABLE_ATSPI )
+  SET( SOURCES ${SOURCES} ${adaptor_accessibility_atspi_bridge_src_files} )
+ELSE()
+  SET( SOURCES ${SOURCES} ${adaptor_accessibility_atspi_dummy_src_files} )
+ENDIF()
+
 IF( ENABLE_PKG_CONFIGURE )
   # Configure the pkg-config file
   # Requires the following variables to be setup:

diff --git a/build/tizen/profiles/ubuntu-profile.cmake b/build/tizen/profiles/ubuntu-profile.cmake
index 94496ec..317766a 100644 (file)
--- a/build/tizen/profiles/ubuntu-profile.cmake
+++ b/build/tizen/profiles/ubuntu-profile.cmake
@@ -1,5 +1,7 @@
 # PROFILE: UBUNTU
 
+SET( ENABLE_ATSPI ON )
+
 # Set the sources
 SET( SOURCES
         ${adaptor_accessibility_common_src_files}

diff --git a/dali/internal/accessibility/file.list b/dali/internal/accessibility/file.list
index 8ba94b7..30f853a 100755 (executable)
--- a/dali/internal/accessibility/file.list
+++ b/dali/internal/accessibility/file.list
@@ -9,19 +9,6 @@ SET( adaptor_accessibility_common_src_files
 SET( adaptor_accessibility_tizen_wayland_src_files
     ${adaptor_accessibility_dir}/tizen-wayland/tts-player-factory-tizen.cpp
     ${adaptor_accessibility_dir}/tizen-wayland/tts-player-impl-tizen.cpp
-    ${adaptor_accessibility_dir}/bridge/accessible.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-accessible.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-action.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-base.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-collection.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-component.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-editable-text.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-impl.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-object.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-text.cpp
-    ${adaptor_accessibility_dir}/bridge/bridge-value.cpp
-    ${adaptor_accessibility_dir}/bridge/component.cpp
-    ${adaptor_accessibility_dir}/bridge/dbus-tizen.cpp
 )
 
 # module: accessibility, backend: tizen-common profile
@@ -48,6 +35,19 @@ SET( adaptor_accessibility_tizen_wearable_src_files
 SET( adaptor_accessibility_ubuntu_src_files
     ${adaptor_accessibility_dir}/generic/tts-player-factory-generic.cpp
     ${adaptor_accessibility_dir}/generic/tts-player-impl-generic.cpp
+)
+
+# module: accessibility, backend: android
+SET( adaptor_accessibility_android_src_files
+    ${adaptor_accessibility_dir}/generic/tts-player-factory-generic.cpp
+    ${adaptor_accessibility_dir}/generic/tts-player-impl-generic.cpp
+)
+
+# module: accessibility, backend: windows
+SET( adaptor_accessibility_windows_src_files
+)
+
+SET( adaptor_accessibility_atspi_bridge_src_files
     ${adaptor_accessibility_dir}/bridge/accessible.cpp
     ${adaptor_accessibility_dir}/bridge/bridge-accessible.cpp
     ${adaptor_accessibility_dir}/bridge/bridge-action.cpp
@@ -63,14 +63,6 @@ SET( adaptor_accessibility_ubuntu_src_files
     ${adaptor_accessibility_dir}/bridge/dbus-tizen.cpp
 )
 
-# module: accessibility, backend: android
-SET( adaptor_accessibility_android_src_files
-    ${adaptor_accessibility_dir}/generic/tts-player-factory-generic.cpp
-    ${adaptor_accessibility_dir}/generic/tts-player-impl-generic.cpp
-    ${adaptor_accessibility_dir}/bridge/dummy-atspi.cpp
-)
-
-# module: accessibility, backend: windows
-SET( adaptor_accessibility_windows_src_files
+SET( adaptor_accessibility_atspi_dummy_src_files
     ${adaptor_accessibility_dir}/bridge/dummy-atspi.cpp
 )