projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Change visual animation code" into devel/master
[platform/core/uifw/dali-demo.git]
/
build
/
tizen
/
examples
/
CMakeLists.txt
diff --git
a/build/tizen/examples/CMakeLists.txt
b/build/tizen/examples/CMakeLists.txt
index
3a55570
..
ed65080
100644
(file)
--- a/
build/tizen/examples/CMakeLists.txt
+++ b/
build/tizen/examples/CMakeLists.txt
@@
-13,6
+13,13
@@
MACRO(SUBDIRLIST result curdir)
ENDMACRO()
SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
ENDMACRO()
SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
+SET(SCENE_LOADER_DIR "scene-loader")
+IF (NOT "${ENABLE_SCENE_LOADER}" )
+ IF ( ${SCENE_LOADER_DIR} IN_LIST SUBDIRS )
+ LIST( REMOVE_ITEM SUBDIRS ${SCENE_LOADER_DIR} )
+ ENDIF()
+ENDIF()
+
FOREACH(EXAMPLE ${SUBDIRS})
FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
FOREACH(EXAMPLE ${SUBDIRS})
FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
@@
-21,6
+28,6
@@
FOREACH(EXAMPLE ${SUBDIRS})
ELSE()
ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS})
ENDIF()
ELSE()
ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS})
ENDIF()
- TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_
PKGS_LDFLAGS} -pie
)
+ TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_
LIBS}
)
INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})
ENDFOREACH(EXAMPLE)
INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})
ENDFOREACH(EXAMPLE)