Peter M. Groen / dali-demo

Commit 97a96f6530c3ccfc6e365b19ee346df3caf551d2

Authored by Tom Robinson
1 parent 22a0fb75

Build: Only copy dali-toy on Desktop build 

Change-Id: I85adbc37a0474ae79918e289ddf2a6e39f7d24a6
Inline Side-by-side
Showing 1 changed file with 10 additions and 6 deletions
build/tizen/CMakeLists.txt
  View file @97a96f6
@@ -14,11 +14,12 @@ IF(DEFINED DALI_APP_DIR) @@ -14,11 +14,12 @@ IF(DEFINED DALI_APP_DIR)
14 ELSE() 14 ELSE()
15 SET(APP_DATA_DIR ${PREFIX}/share/com.samsung.dali-demo) 15 SET(APP_DATA_DIR ${PREFIX}/share/com.samsung.dali-demo)
16 SET(BINDIR ${PREFIX}/bin) 16 SET(BINDIR ${PREFIX}/bin)
  17 +
  18 + # Directory for compiled Emscripten artifacts along with Emscripten examples and demos.
  19 + SET(EMSCRIPTEN_ENV_DIR ${APP_DATA_DIR}/../emscripten/)
  20 + SET(EMSCRIPTEN_EXAMPLE_DIR ${ROOT_SRC_DIR}/emscripten-examples/)
17 ENDIF() 21 ENDIF()
18 22
19 -# Directory for compiled Emscripten artifacts along with Emscripten examples and demos.  
20 -SET(EMSCRIPTEN_ENV_DIR ${PREFIX}/share/emscripten)  
21 -SET(EMSCRIPTEN_EXAMPLE_DIR ${ROOT_SRC_DIR}/emscripten-examples/)  
22 23
23 SET(RESOURCE_DIR ${ROOT_SRC_DIR}/resources) 24 SET(RESOURCE_DIR ${ROOT_SRC_DIR}/resources)
24 SET(LOCAL_IMAGES_DIR ${RESOURCE_DIR}/images) 25 SET(LOCAL_IMAGES_DIR ${RESOURCE_DIR}/images)
@@ -98,6 +99,9 @@ ADD_SUBDIRECTORY(demo) @@ -98,6 +99,9 @@ ADD_SUBDIRECTORY(demo)
98 ADD_SUBDIRECTORY(examples) 99 ADD_SUBDIRECTORY(examples)
99 ADD_SUBDIRECTORY(builder) 100 ADD_SUBDIRECTORY(builder)
100 101
101 -CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.js ${EMSCRIPTEN_ENV_DIR} )  
102 -CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.html ${EMSCRIPTEN_ENV_DIR} )  
103 -CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-doc-demo.html ${EMSCRIPTEN_ENV_DIR} ) 102 +IF(NOT DEFINED DALI_APP_DIR)
  103 + FILE( MAKE_DIRECTORY ${EMSCRIPTEN_ENV_DIR} )
  104 + CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.js ${EMSCRIPTEN_ENV_DIR}/ )
  105 + CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.html ${EMSCRIPTEN_ENV_DIR}/ )
  106 + CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-doc-demo.html ${EMSCRIPTEN_ENV_DIR}/ )
  107 +ENDIF()