yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=670d4a117d928f80955fc3acf3bed480d1fd695a

commit 670d4a117d928f80955fc3acf3bed480d1fd695a
Author: Yakov Goldberg <[email protected]>
Date:   Mon May 11 15:49:26 2015 +0300

    Move layouts folder into bin folder
---
 CMakeLists.txt                                 | 1 -
 src/bin/gui/CMakeLists.txt                     | 3 ++-
 src/bin/gui/egui_layout.json                   | 2 +-
 {data => src/bin/gui}/layouts/CMakeLists.txt   | 0
 {data => src/bin/gui}/layouts/panes_layout.edc | 0
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8659817..eab1635 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,4 +75,3 @@ add_subdirectory(src/lib)
 add_subdirectory(src/bin)
 add_subdirectory(src/tests)
 add_subdirectory(data/config)
-add_subdirectory(data/layouts)
diff --git a/src/bin/gui/CMakeLists.txt b/src/bin/gui/CMakeLists.txt
index e600edc..b91d3e4 100644
--- a/src/bin/gui/CMakeLists.txt
+++ b/src/bin/gui/CMakeLists.txt
@@ -24,7 +24,7 @@ if (${EGUI_IS_RELEASE})
 elseif (NOT ${EGUI_IS_RELEASE})
    set(PACKAGE_DATA_DIR_DEFINITION PACKAGE_DATA_DIR="${CMAKE_BINARY_DIR}/data")
    set(PACKAGE_IMAGES_DIR_DEFINITION 
EGUI_LAYOUT_IMAGES_PATH="${CMAKE_CURRENT_BINARY_DIR}/images")
-   set(PACKAGE_EDJE_DIR_DEFINITION 
EGUI_LAYOUT_EDJE_PATH="${CMAKE_BINARY_DIR}/data/layouts")
+   set(PACKAGE_EDJE_DIR_DEFINITION 
EGUI_LAYOUT_EDJE_PATH="${CMAKE_CURRENT_BINARY_DIR}/layouts")
    set(PACKAGE_THEME_DIR_DEFINITION 
EGUI_LAYOUT_THEME_PATH="${CMAKE_BINARY_DIR}/data/themes")
 endif(${EGUI_IS_RELEASE})
 
@@ -99,3 +99,4 @@ target_link_libraries (${TARGET}
 install(TARGETS ${TARGET} DESTINATION bin)
 
 add_subdirectory(images)
+add_subdirectory(layouts)
diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json
index 797349d..8a19a21 100644
--- a/src/bin/gui/egui_layout.json
+++ b/src/bin/gui/egui_layout.json
@@ -44,7 +44,7 @@
     },
     "Edjes":
     {
-      "panes_layout":["data/layouts/panes_layout.edj", ""]
+      "panes_layout":["layouts/panes_layout.edj", ""]
     }
   },
   "Widgets":
diff --git a/data/layouts/CMakeLists.txt b/src/bin/gui/layouts/CMakeLists.txt
similarity index 100%
rename from data/layouts/CMakeLists.txt
rename to src/bin/gui/layouts/CMakeLists.txt
diff --git a/data/layouts/panes_layout.edc 
b/src/bin/gui/layouts/panes_layout.edc
similarity index 100%
rename from data/layouts/panes_layout.edc
rename to src/bin/gui/layouts/panes_layout.edc

-- 


Reply via email to