[dali_1.4.57] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9114e20..ff17e64 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ ADD_DEFINITIONS(
 )\r
 \r
 #head file path\r
-INCLUDE_DIRECTORIES(  \r
+INCLUDE_DIRECTORIES(\r
 ./\r
 ../dali-core\r
 ../dali-adaptor\r
@@ -62,15 +62,6 @@ SET ( SOURCES ${SOURCES}
   ${devel_api_src_dir}/image-loader/atlas-upload-observer.cpp\r
   ${devel_api_src_dir}/image-loader/image-atlas.cpp\r
   ${devel_api_src_dir}/image-loader/texture-manager.cpp\r
-  ${devel_api_src_dir}/layouting/absolute-layout.cpp\r
-  ${devel_api_src_dir}/layouting/grid.cpp\r
-  ${devel_api_src_dir}/layouting/linear-layout.cpp\r
-  ${devel_api_src_dir}/layouting/layout-item-impl.cpp\r
-  ${devel_api_src_dir}/layouting/layout-item.cpp\r
-  ${devel_api_src_dir}/layouting/layout-group-impl.cpp\r
-  ${devel_api_src_dir}/layouting/layout-group.cpp\r
-  ${devel_api_src_dir}/layouting/layout-controller.cpp\r
-  ${devel_api_src_dir}/scripting/script.cpp\r
   ${devel_api_src_dir}/styling/style-manager-devel.cpp\r
   ${devel_api_src_dir}/transition-effects/cube-transition-cross-effect.cpp\r
   ${devel_api_src_dir}/transition-effects/cube-transition-effect.cpp\r
@@ -96,15 +87,6 @@ SET( SOURCES ${SOURCES}
    ${internal_src_dir}/builder/style.cpp\r
    ${internal_src_dir}/builder/tree-node-manipulator.cpp\r
    ${internal_src_dir}/builder/replacement.cpp\r
-   ${internal_src_dir}/layouting/absolute-layout-impl.cpp\r
-   ${internal_src_dir}/layouting/grid-impl.cpp\r
-   ${internal_src_dir}/layouting/grid-locations.cpp\r
-   ${internal_src_dir}/layouting/linear-layout-impl.cpp\r
-   ${internal_src_dir}/layouting/layout-item-data-impl.cpp\r
-   ${internal_src_dir}/layouting/layout-group-data-impl.cpp\r
-   ${internal_src_dir}/layouting/layout-controller-impl.cpp\r
-   ${internal_src_dir}/layouting/layout-controller-debug.cpp\r
-   ${internal_src_dir}/layouting/layout-transition-data-impl.cpp\r
    ${internal_src_dir}/visuals/animated-image/animated-image-visual.cpp\r
    ${internal_src_dir}/visuals/animated-image/image-cache.cpp\r
    ${internal_src_dir}/visuals/animated-image/fixed-image-cache.cpp\r
@@ -248,8 +230,6 @@ SET( SOURCES ${SOURCES}
    ${internal_src_dir}/transition-effects/cube-transition-cross-effect-impl.cpp\r
    ${internal_src_dir}/transition-effects/cube-transition-fold-effect-impl.cpp\r
    ${internal_src_dir}/transition-effects/cube-transition-wave-effect-impl.cpp\r
-   ${internal_src_dir}/scripting/script-impl.cpp\r
-   ${internal_src_dir}/scripting/script-plugin-proxy.cpp\r
    ${internal_src_dir}/text/xhtml-entities.cpp\r
 )\r
 \r
@@ -322,5 +302,5 @@ target_link_libraries(dali-toolkit WindowsPlatform.lib)
 add_dependencies(dali-toolkit dali-core)\r
 add_dependencies(dali-toolkit dali-adaptor)\r
 \r
-#add link library  \r
+#add link library\r
 #TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES})\r