summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-10-26 16:55:08 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-10-27 15:32:32 +0200
commit7b7bd7daf6a533e7d89560a27852b29515acadab (patch)
tree09fc3bfc87f31ff88a866ac2f30e43211a2d0a3f
parentacf201f2256a4bdb8a97ec661f032d8a1dc78287 (diff)
change egui->erigo
-rw-r--r--src/bin/CMakeLists.txt7
-rw-r--r--src/bin/egui_gui/CMakeLists.txt2
-rw-r--r--src/bin/main.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 0e8ffc0..5b239bb 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -10,7 +10,7 @@ set(TARGET erigo_cmd)
10 10
11add_executable(${TARGET} main.c) 11add_executable(${TARGET} main.c)
12 12
13# this puts "/build_dir/data/config" path to egui_cmd 13# this puts "/build_dir/data/config" path to erigo_cmd
14set_property(TARGET ${TARGET} 14set_property(TARGET ${TARGET}
15 PROPERTY COMPILE_DEFINITIONS PACKAGE_DATA_DIR="${CMAKE_BINARY_DIR}/data") 15 PROPERTY COMPILE_DEFINITIONS PACKAGE_DATA_DIR="${CMAKE_BINARY_DIR}/data")
16include_directories( 16include_directories(
@@ -31,10 +31,9 @@ target_link_libraries (${TARGET}
31 pthread 31 pthread
32 ) 32 )
33 33
34# Save current dir because we want to know path to soutce file to build egui 34# Save current dir because we want to know path to soutce file to build erigo
35SET(EGUI_BINARY_SRC ${CMAKE_CURRENT_LIST_DIR}) 35SET(EGUI_BINARY_SRC ${CMAKE_CURRENT_LIST_DIR})
36# Save build path of egui_cmd, because we want to copy egui to the same folder 36# Save build path of erigo_cmd, because we want to copy egui to the same folder
37SET(EGUI_BINARY_BLD ${CMAKE_CURRENT_BINARY_DIR}) 37SET(EGUI_BINARY_BLD ${CMAKE_CURRENT_BINARY_DIR})
38 38
39add_subdirectory(egui_gui) 39add_subdirectory(egui_gui)
40#add_subdirectory(egui_auto)
diff --git a/src/bin/egui_gui/CMakeLists.txt b/src/bin/egui_gui/CMakeLists.txt
index 7973272..8721dc9 100644
--- a/src/bin/egui_gui/CMakeLists.txt
+++ b/src/bin/egui_gui/CMakeLists.txt
@@ -43,7 +43,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
43 43
44add_custom_command( 44add_custom_command(
45 OUTPUT egui_layout.c egui_layout.h 45 OUTPUT egui_layout.c egui_layout.h
46 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/egui_layout.json ${EGUI_BINARY_BLD}/egui_cmd 46 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/egui_layout.json ${EGUI_BINARY_BLD}/erigo_cmd
47 COMMENT "Generating gui layout from JSON" 47 COMMENT "Generating gui layout from JSON"
48 COMMAND ${EGUI_BINARY_BLD}/erigo_cmd -e c -o ./egui_layout ${CMAKE_CURRENT_SOURCE_DIR}/egui_layout.json 48 COMMAND ${EGUI_BINARY_BLD}/erigo_cmd -e c -o ./egui_layout ${CMAKE_CURRENT_SOURCE_DIR}/egui_layout.json
49 ) 49 )
diff --git a/src/bin/main.c b/src/bin/main.c
index 2d05015..ae6ee45 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -257,7 +257,7 @@ main(int argc, char **argv)
257 egui_stop(); 257 egui_stop();
258 elm_shutdown(); 258 elm_shutdown();
259#else 259#else
260 printf("You are trying to use \"egui_cmd\" in graphic mode. Nothing is going to happen :)\n"); 260 printf("You are trying to use \"erigo_cmd\" in graphic mode. Nothing is going to happen :)\n");
261#endif 261#endif
262 } 262 }
263 else if (mode == MODE_SIMULATE) 263 else if (mode == MODE_SIMULATE)