From 97a96f6530c3ccfc6e365b19ee346df3caf551d2 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Thu, 25 Feb 2016 17:03:03 +0000 Subject: [PATCH] Build: Only copy dali-toy on Desktop build Change-Id: I85adbc37a0474ae79918e289ddf2a6e39f7d24a6 --- build/tizen/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 24a666e..c21bf09 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -14,11 +14,12 @@ IF(DEFINED DALI_APP_DIR) ELSE() SET(APP_DATA_DIR ${PREFIX}/share/com.samsung.dali-demo) SET(BINDIR ${PREFIX}/bin) + + # Directory for compiled Emscripten artifacts along with Emscripten examples and demos. + SET(EMSCRIPTEN_ENV_DIR ${APP_DATA_DIR}/../emscripten/) + SET(EMSCRIPTEN_EXAMPLE_DIR ${ROOT_SRC_DIR}/emscripten-examples/) ENDIF() -# Directory for compiled Emscripten artifacts along with Emscripten examples and demos. -SET(EMSCRIPTEN_ENV_DIR ${PREFIX}/share/emscripten) -SET(EMSCRIPTEN_EXAMPLE_DIR ${ROOT_SRC_DIR}/emscripten-examples/) SET(RESOURCE_DIR ${ROOT_SRC_DIR}/resources) SET(LOCAL_IMAGES_DIR ${RESOURCE_DIR}/images) @@ -98,6 +99,9 @@ ADD_SUBDIRECTORY(demo) ADD_SUBDIRECTORY(examples) ADD_SUBDIRECTORY(builder) -CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.js ${EMSCRIPTEN_ENV_DIR} ) -CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.html ${EMSCRIPTEN_ENV_DIR} ) -CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-doc-demo.html ${EMSCRIPTEN_ENV_DIR} ) +IF(NOT DEFINED DALI_APP_DIR) + FILE( MAKE_DIRECTORY ${EMSCRIPTEN_ENV_DIR} ) + CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.js ${EMSCRIPTEN_ENV_DIR}/ ) + CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.html ${EMSCRIPTEN_ENV_DIR}/ ) + CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-doc-demo.html ${EMSCRIPTEN_ENV_DIR}/ ) +ENDIF() -- 2.7.4