From 594401435c108814818ce7a6a1632a33e66b1f13 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Wed, 18 Feb 2015 13:13:58 +0000 Subject: [PATCH] Changed build system to CMake --- README | 3 +-- build/tizen/.gitignore | 18 +++++------------- build/tizen/CMakeLists.txt | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ build/tizen/Makefile.am | 17 ----------------- build/tizen/configure.ac | 81 --------------------------------------------------------------------------------- build/tizen/demo/CMakeLists.txt | 8 ++++++++ build/tizen/demo/Makefile.am | 54 ------------------------------------------------------ build/tizen/docs/Makefile.am | 7 ------- build/tizen/examples/CMakeLists.txt | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ build/tizen/examples/Makefile.am | 178 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- packaging/com.samsung.dali-demo.spec | 9 ++------- 11 files changed, 200 insertions(+), 359 deletions(-) create mode 100644 build/tizen/CMakeLists.txt delete mode 100644 build/tizen/Makefile.am delete mode 100644 build/tizen/configure.ac create mode 100644 build/tizen/demo/CMakeLists.txt delete mode 100644 build/tizen/demo/Makefile.am delete mode 100644 build/tizen/docs/Makefile.am create mode 100644 build/tizen/examples/CMakeLists.txt delete mode 100644 build/tizen/examples/Makefile.am diff --git a/README b/README index dc7b5af..5187f08 100644 --- a/README +++ b/README @@ -43,7 +43,6 @@ To build the repository enter the 'build/tizen' folder: Then run the following commands: - autoreconf --install - ./configure --prefix=$DESKTOP_PREFIX + cmake -DCMAKE_INSTALL_PREFIX=$DESKTOP_PREFIX . make install -j8 diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore index 1e145df..1712ae7 100644 --- a/build/tizen/.gitignore +++ b/build/tizen/.gitignore @@ -1,16 +1,8 @@ -/aclocal.m4 -/autom4te.cache -/compile -/config.guess -/config.log -/config.status -/config.sub -/configure -/depcomp -/install-sh -/libtool -/ltmain.sh -/missing +CMakeCache.txt +CMakeFiles/ +cmake_install.cmake +demo/dali-demo +install_manifest.txt /demo/dali-demo /demo/dali-examples /demo/dali-performance diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt new file mode 100644 index 0000000..5147cb3 --- /dev/null +++ b/build/tizen/CMakeLists.txt @@ -0,0 +1,73 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(dali-demo C CXX) + +SET(dali-demo_VERSION_MAJOR 1) +SET(dali-demo_VERSION_MINOR 0) + +SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..) + +SET(PREFIX ${CMAKE_INSTALL_PREFIX}) + +IF(DEFINED DALI_APP_DIR) + SET(APP_DATA_DIR ${DALI_APP_DIR}) + SET(BINDIR ${APP_DATA_DIR}/bin) +ELSE() + SET(APP_DATA_DIR ${PREFIX}/share/com.samsung.dali-demo) + SET(BINDIR ${PREFIX}/bin) +ENDIF() + +SET(LOCAL_IMAGES_DIR ${ROOT_SRC_DIR}/demo/images) +SET(LOCAL_MODELS_DIR ${ROOT_SRC_DIR}/demo/models) +SET(LOCAL_SCRIPTS_DIR ${ROOT_SRC_DIR}/demo/scripts) + +SET(IMAGES_DIR ${APP_DATA_DIR}/images/) +SET(MODELS_DIR ${APP_DATA_DIR}/models/) +SET(SCRIPTS_DIR ${APP_DATA_DIR}/scripts/) + +SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\") +SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\") +SET(DALI_SCRIPT_DIR \\"${SCRIPTS_DIR}\\") +SET(DALI_EXAMPLE_BIN \\"${BINDIR}/\\") + +FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png") +FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg") +FILE(GLOB LOCAL_IMAGES_GIF RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.gif") +FILE(GLOB LOCAL_IMAGES_BMP RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.bmp") +FILE(GLOB LOCAL_IMAGES_ICO RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.ico") +FILE(GLOB LOCAL_IMAGES_WBMP RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.wbmp") + +SET(LOCAL_IMAGES_LIST ${LOCAL_IMAGES_PNG};${LOCAL_IMAGES_JPG};${LOCAL_IMAGES_GIF};${LOCAL_IMAGES_BMP};${LOCAL_IMAGES_ICO};${LOCAL_IMAGES_WBMP}) +FOREACH(flag ${LOCAL_IMAGES_LIST}) + INSTALL(FILES ../../demo/images/${flag} DESTINATION ${IMAGES_DIR}) +ENDFOREACH(flag) + +FILE(GLOB LOCAL_MODELS_LIST RELATIVE "${LOCAL_MODELS_DIR}" "${LOCAL_MODELS_DIR}/*") +FOREACH(flag ${LOCAL_MODELS_LIST}) + INSTALL(FILES ../../demo/models/${flag} DESTINATION ${MODELS_DIR}) +ENDFOREACH(flag) + +FILE(GLOB LOCAL_SCRIPTS_LIST RELATIVE "${LOCAL_SCRIPTS_DIR}" "${LOCAL_SCRIPTS_DIR}/*") +FOREACH(flag ${LOCAL_SCRIPTS_LIST}) + INSTALL(FILES ../../demo/scripts/${flag} DESTINATION ${SCRIPTS_DIR}) +ENDFOREACH(flag) + +SET(PKG_LIST dali + dali-toolkit) + +INCLUDE(FindPkgConfig) +pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST}) + +FOREACH(flag ${REQUIRED_PKGS_CFLAGS}) + SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(DALI_DEMO_CFLAGS "-DDALI_IMAGE_DIR=${DALI_IMAGE_DIR} -DDALI_MODEL_DIR=${DALI_MODEL_DIR} -DDALI_SCRIPT_DIR=${DALI_SCRIPT_DIR} -DDALI_EXAMPLE_BIN=${DALI_EXAMPLE_BIN} -fvisibility=hidden -DHIDE_DALI_INTERNALS") + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall") +SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") + +INCLUDE_DIRECTORIES(${ROOT_SRC_DIR}) +INCLUDE_DIRECTORIES(${DEMO_SRC_DIR}) + +ADD_SUBDIRECTORY(demo) +ADD_SUBDIRECTORY(examples) diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am deleted file mode 100644 index e8fb71e..0000000 --- a/build/tizen/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -SUBDIRS = examples demo - -MAINTAINERCLEANFILES = \ - aclocal.m4 \ - autom4te.cache \ - config.guess \ - config.sub \ - configure \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - `find "$(srcdir)" -type f -name Makefile.in -print` \ - `find . \( -name "*.gcov" -o -name "*.gcno" -o -name "*.gcda" \) -print` - -CLEANFILES = \ - `find . \( -name "*.gcov" -o -name "*.gcno" -o -name "*.gcda" \) -print` diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac deleted file mode 100644 index 8ac8f52..0000000 --- a/build/tizen/configure.ac +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright (c) 2014 Samsung Electronics Co., Ltd. - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -m4_define([dali_version],[0.1.0]) -AC_INIT([dali], [dali_version]) -AM_INIT_AUTOMAKE([-Wall foreign]) - -AC_PROG_CXX -AC_PROG_LIBTOOL - -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -LT_INIT - -DALI_VERSION=dali_version -AC_SUBST(DALI_VERSION) - -PKG_CHECK_MODULES(DALI, dali) -PKG_CHECK_MODULES(DALI_TOOLKIT, dali-toolkit) - -DALIDEMO_CFLAGS=-DPLATFORM_SLP - -AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug], - [Turns on debugging])], - [enable_debug=$enableval], - [enable_debug=no]) - -if test "x$enable_debug" = "xyes"; then - DALIDEMO_CFLAGS="$DALIDEMO_CFLAGS -DDEBUG_ENABLED" -fi - -if test x$DALI_APP_DIR != x; then - appdatadir=$DALI_APP_DIR - exedir=${appdatadir}/bin/ -else - appdatadir=${prefix}/share/com.samsung.dali-demo/ - exedir=${prefix}/bin/ -fi - -AC_SUBST(datadir) -AC_SUBST(appdatadir) -AC_SUBST(exedir) -AC_SUBST(DALIDEMO_CFLAGS) - -dnl ************************************************************************** -dnl ** Set Debian install Prefix ** -dnl ************************************************************************** -debian_prefix=${prefix#*/} -AC_SUBST(debian_prefix) - -AC_CONFIG_FILES([ - Makefile - demo/Makefile - examples/Makefile -]) - - -AC_OUTPUT - -echo " -Configuration -------------- - Prefix: $prefix - Debug Build: $enable_debug - Application Data Dir: $appdatadir - Application Exe Dir: $exedir - DALIDEMO_CFLAGS: ${DALIDEMO_CFLAGS} -" diff --git a/build/tizen/demo/CMakeLists.txt b/build/tizen/demo/CMakeLists.txt new file mode 100644 index 0000000..83fe747 --- /dev/null +++ b/build/tizen/demo/CMakeLists.txt @@ -0,0 +1,8 @@ +SET(DEMO_SRC_DIR ${ROOT_SRC_DIR}/demo) + +AUX_SOURCE_DIRECTORY(${DEMO_SRC_DIR} DEMO_SRCS) + +ADD_EXECUTABLE(${PROJECT_NAME} ${DEMO_SRCS}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS}) + +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) diff --git a/build/tizen/demo/Makefile.am b/build/tizen/demo/Makefile.am deleted file mode 100644 index a1713fe..0000000 --- a/build/tizen/demo/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2014 Samsung Electronics Co., Ltd. - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -bin_PROGRAMS = \ - dali-demo - -demo_src_dir = ../../../demo -include ../../../demo/file.list - -dalidemoimagesdir = $(appdatadir)/images/ -dalidemoimages_DATA = $(demo_image_files) - -dalidemomodelsdir = $(appdatadir)/models/ -dalidemomodels_DATA = $(demo_model_files) - -dalidemoshadersdir = $(appdatadir)/shaders/ -dalidemoshaders_DATA = $(demo_shader_files) - -dalidemoscriptsdir = $(appdatadir)/scripts/ -dalidemoscripts_DATA = $(demo_script_files) - - -DEMO_CXXFLAGS = -DDALI_IMAGE_DIR="\"$(dalidemoimagesdir)\"" \ - -DDALI_MODEL_DIR="\"$(dalidemomodelsdir)\"" \ - -DDALI_SCRIPT_DIR="\"$(dalidemoscriptsdir)\"" \ - -DDALI_SHADER_DIR="\"$(dalidemoshadersdir)\"" \ - -DDALI_EXAMPLE_BIN="\"$(exedir)\"" \ - -I../../../demo -I../../.. \ - $(DALIDEMO_CFLAGS) \ - $(DALI_TOOLKIT_CFLAGS) \ - $(DALI_CFLAGS) \ - $(AUL_CFLAGS) \ - -Werror -Wall - -DEMO_DEPS = - -DEMO_LDADD = $(DALI_LIBS) $(DALI_TOOLKIT_LIBS) $(AUL_LIBS) - -dali_demo_SOURCES = $(demo_src_files) -dali_demo_CXXFLAGS = $(DEMO_CXXFLAGS) -dali_demo_DEPENDENCIES = $(DEMO_DEPS) -dali_demo_LDADD = $(DEMO_LDADD) diff --git a/build/tizen/docs/Makefile.am b/build/tizen/docs/Makefile.am deleted file mode 100644 index 8d70825..0000000 --- a/build/tizen/docs/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -all-local: - @rm -f doxygen-errors.txt - @-doxygen dali.doxy &> doxygen-errors.txt || rm doxygen-errors.txt - @touch doxygen-errors.txt - @cat doxygen-errors.txt - @if [ -s doxygen-errors.txt ]; then exit 1 ; fi - @rm doxygen-errors.txt diff --git a/build/tizen/examples/CMakeLists.txt b/build/tizen/examples/CMakeLists.txt new file mode 100644 index 0000000..0ea3823 --- /dev/null +++ b/build/tizen/examples/CMakeLists.txt @@ -0,0 +1,111 @@ +SET(EXAMPLES_SRC_DIR ${ROOT_SRC_DIR}/examples) + +SET(BLOCKS_SRCS ${EXAMPLES_SRC_DIR}/blocks/blocks-example.cpp) +ADD_EXECUTABLE(blocks.example ${BLOCKS_SRCS}) +TARGET_LINK_LIBRARIES(blocks.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS blocks.example DESTINATION ${BINDIR}) + +SET(BUBBLE_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/shader-effect/bubble-effect-example.cpp) +ADD_EXECUTABLE(bubble-effect.example ${BUBBLE_EFFECT_SRCS}) +TARGET_LINK_LIBRARIES(bubble-effect.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS bubble-effect.example DESTINATION ${BINDIR}) + +SET(CLUSTER_SRCS ${EXAMPLES_SRC_DIR}/cluster/cluster-example.cpp) +ADD_EXECUTABLE(cluster.example ${CLUSTER_SRCS}) +TARGET_LINK_LIBRARIES(cluster.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS cluster.example DESTINATION ${BINDIR}) + +SET(CUBE_TRANSITION_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/transition/cube-transition-effect-example.cpp) +ADD_EXECUTABLE(cube-transition-effect.example ${CUBE_TRANSITION_EFFECT_SRCS}) +TARGET_LINK_LIBRARIES(cube-transition-effect.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS cube-transition-effect.example DESTINATION ${BINDIR}) + +SET(DISSOLVE_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/shader-effect/dissolve-effect-example.cpp) +ADD_EXECUTABLE(dissolve-effect.example ${DISSOLVE_EFFECT_SRCS}) +TARGET_LINK_LIBRARIES(dissolve-effect.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS dissolve-effect.example DESTINATION ${BINDIR}) + +SET(HELLO_WORLD_SRCS ${EXAMPLES_SRC_DIR}/hello-world/hello-world-example.cpp) +ADD_EXECUTABLE(hello-world.example ${HELLO_WORLD_SRCS}) +TARGET_LINK_LIBRARIES(hello-world.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS hello-world.example DESTINATION ${BINDIR}) + +SET(ITEM_VIEW_SRCS ${EXAMPLES_SRC_DIR}/item-view/item-view-example.cpp) +ADD_EXECUTABLE(item-view.example ${ITEM_VIEW_SRCS}) +TARGET_LINK_LIBRARIES(item-view.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS item-view.example DESTINATION ${BINDIR}) + +SET(MAGNIFIER_SRCS ${EXAMPLES_SRC_DIR}/magnifier/magnifier-example.cpp) +ADD_EXECUTABLE(magnifier.example ${MAGNIFIER_SRCS}) +TARGET_LINK_LIBRARIES(magnifier.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS magnifier.example DESTINATION ${BINDIR}) + +SET(MOTION_BLUR_SRCS ${EXAMPLES_SRC_DIR}/motion/motion-blur-example.cpp) +ADD_EXECUTABLE(motion-blur.example ${MOTION_BLUR_SRCS}) +TARGET_LINK_LIBRARIES(motion-blur.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS motion-blur.example DESTINATION ${BINDIR}) + +SET(MOTION_STRETCH_SRCS ${EXAMPLES_SRC_DIR}/motion/motion-stretch-example.cpp) +ADD_EXECUTABLE(motion-stretch.example ${MOTION_STRETCH_SRCS}) +TARGET_LINK_LIBRARIES(motion-stretch.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS motion-stretch.example DESTINATION ${BINDIR}) + +SET(NEW_WINDOW_SRCS ${EXAMPLES_SRC_DIR}/new-window/new-window-example.cpp) +ADD_EXECUTABLE(new-window.example ${NEW_WINDOW_SRCS}) +TARGET_LINK_LIBRARIES(new-window.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS new-window.example DESTINATION ${BINDIR}) + +SET(PAGE_TURN_VIEW_SRCS ${EXAMPLES_SRC_DIR}/page-turn-view/page-turn-view-example.cpp) +ADD_EXECUTABLE(page-turn-view.example ${PAGE_TURN_VIEW_SRCS}) +TARGET_LINK_LIBRARIES(page-turn-view.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS page-turn-view.example DESTINATION ${BINDIR}) + +AUX_SOURCE_DIRECTORY(${EXAMPLES_SRC_DIR}/radial-menu RADIAL_MENU_SRCS) +ADD_EXECUTABLE(radial-menu.example ${RADIAL_MENU_SRCS}) +TARGET_LINK_LIBRARIES(radial-menu.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS radial-menu.example DESTINATION ${BINDIR}) + +SET(REFRACTION_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/shader-effect/refraction-effect-example.cpp) +ADD_EXECUTABLE(refraction-effect.example ${REFRACTION_EFFECT_SRCS}) +TARGET_LINK_LIBRARIES(refraction-effect.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS refraction-effect.example DESTINATION ${BINDIR}) + +SET(SCROLL_VIEW_SRCS ${EXAMPLES_SRC_DIR}/scroll-view/scroll-view-example.cpp) +ADD_EXECUTABLE(scroll-view.example ${SCROLL_VIEW_SRCS}) +TARGET_LINK_LIBRARIES(scroll-view.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS scroll-view.example DESTINATION ${BINDIR}) + +SET(SHADOW_BONE_LIGHTING_SRCS ${EXAMPLES_SRC_DIR}/shadows/shadow-bone-lighting-example.cpp) +ADD_EXECUTABLE(shadow-bone-lighting.example ${SHADOW_BONE_LIGHTING_SRCS}) +TARGET_LINK_LIBRARIES(shadow-bone-lighting.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS shadow-bone-lighting.example DESTINATION ${BINDIR}) + +SET(DALI_BUILDER_SRCS ${EXAMPLES_SRC_DIR}/builder/dali-builder.cpp) +ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS}) +TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS dali-builder DESTINATION ${BINDIR}) + +SET(BUILDER_SRCS ${EXAMPLES_SRC_DIR}/builder/examples.cpp) +ADD_EXECUTABLE(builder.example ${BUILDER_SRCS}) +TARGET_LINK_LIBRARIES(builder.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS builder.example DESTINATION ${BINDIR}) + +SET(IMAGE_SCALING_IRREGULAR_GRID_SRCS ${EXAMPLES_SRC_DIR}/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp) +ADD_EXECUTABLE(image-scaling-irregular-grid.example ${IMAGE_SCALING_IRREGULAR_GRID_SRCS}) +TARGET_LINK_LIBRARIES(image-scaling-irregular-grid.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS image-scaling-irregular-grid.example DESTINATION ${BINDIR}) + +SET(BUTTONS_SRCS ${EXAMPLES_SRC_DIR}/buttons/buttons-example.cpp) +ADD_EXECUTABLE(buttons.example ${BUTTONS_SRCS}) +TARGET_LINK_LIBRARIES(buttons.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS buttons.example DESTINATION ${BINDIR}) + +SET(TEXT_VIEW_SRCS ${EXAMPLES_SRC_DIR}/text-view/text-view-example.cpp) +ADD_EXECUTABLE(text-view.example ${TEXT_VIEW_SRCS}) +TARGET_LINK_LIBRARIES(text-view.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS text-view.example DESTINATION ${BINDIR}) + +SET(LOGGING_SRCS ${EXAMPLES_SRC_DIR}/logging/logging-example.cpp) +ADD_EXECUTABLE(logging.example ${LOGGING_SRCS}) +TARGET_LINK_LIBRARIES(logging.example ${REQUIRED_PKGS_LDFLAGS}) +INSTALL(TARGETS logging.example DESTINATION ${BINDIR}) diff --git a/build/tizen/examples/Makefile.am b/build/tizen/examples/Makefile.am deleted file mode 100644 index bb61a9c..0000000 --- a/build/tizen/examples/Makefile.am +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright (c) 2014 Samsung Electronics Co., Ltd. - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -examples_src_dir = ../../../examples - -bin_PROGRAMS = \ - blocks.example \ - bubble-effect.example \ - cluster.example \ - cube-transition-effect.example \ - dissolve-effect.example \ - hello-world.example \ - item-view.example \ - magnifier.example \ - motion-blur.example \ - motion-stretch.example \ - new-window.example \ - page-turn-view.example \ - radial-menu.example \ - refraction-effect.example \ - scroll-view.example \ - shadow-bone-lighting.example \ - dali-builder \ - builder.example \ - image-scaling-irregular-grid.example \ - buttons.example \ - text-view.example \ - logging.example - - -daliimagedir = $(appdatadir)/images/ -dalimodeldir = $(appdatadir)/models/ -daliscriptdir = $(appdatadir)/scripts/ - -BASE_CXXFLAGS = -I../../../examples \ - -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \ - -DDALI_MODEL_DIR="\"${dalimodeldir}\"" \ - -DDALI_SCRIPT_DIR="\"${daliscriptdir}\"" \ - $(DALIDEMO_CFLAGS) \ - $(ECORE_X_CFLAGS) \ - $(CAPI_MEDIA_PLAYER_CFLAGS) \ - $(CAPI_APPFW_APPLICATION_CFLAGS) \ - -I/usr/include/media \ - -Werror -Wall - -EXAMPLE_CXXFLAGS = $(DALI_CFLAGS) \ - $(DALI_TOOLKIT_CFLAGS) \ - $(BASE_CXXFLAGS) - - -EXAMPLE_DEPS = - -EXAMPLE_LDADD = $(DALI_LIBS) $(DALI_TOOLKIT_LIBS) $(ECORE_X_LIBS) $(CAPI_MEDIA_PLAYER_LIBS) $(CAPI_APPFW_APPLICATION_LIBS) -lrt -lEGL - - -blocks_example_SOURCES = $(examples_src_dir)/blocks/blocks-example.cpp -blocks_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -blocks_example_DEPENDENCIES = $(EXAMPLE_DEPS) -blocks_example_LDADD = $(EXAMPLE_LDADD) - -bubble_effect_example_SOURCES = $(examples_src_dir)/shader-effect/bubble-effect-example.cpp -bubble_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -bubble_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS) -bubble_effect_example_LDADD = $(EXAMPLE_LDADD) - -cluster_example_SOURCES = $(examples_src_dir)/cluster/cluster-example.cpp -cluster_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -cluster_example_DEPENDENCIES = $(EXAMPLE_DEPS) -cluster_example_LDADD = $(EXAMPLE_LDADD) - -cube_transition_effect_example_SOURCES = $(examples_src_dir)/transition/cube-transition-effect-example.cpp -cube_transition_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -cube_transition_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS) -cube_transition_effect_example_LDADD = $(EXAMPLE_LDADD) - -dissolve_effect_example_SOURCES = $(examples_src_dir)/shader-effect/dissolve-effect-example.cpp -dissolve_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -dissolve_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS) -dissolve_effect_example_LDADD = $(EXAMPLE_LDADD) - -hello_world_example_SOURCES = $(examples_src_dir)/hello-world/hello-world-example.cpp -hello_world_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -hello_world_example_DEPENDENCIES = $(EXAMPLE_DEPS) -hello_world_example_LDADD = $(EXAMPLE_LDADD) - -item_view_example_SOURCES = $(examples_src_dir)/item-view/item-view-example.cpp -item_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -item_view_example_DEPENDENCIES = $(EXAMPLE_DEPS) -item_view_example_LDADD = $(EXAMPLE_LDADD) - -magnifier_example_SOURCES = $(examples_src_dir)/magnifier/magnifier-example.cpp -magnifier_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -magnifier_example_DEPENDENCIES = $(EXAMPLE_DEPS) -magnifier_example_LDADD = $(EXAMPLE_LDADD) - -motion_blur_example_SOURCES = $(examples_src_dir)/motion/motion-blur-example.cpp -motion_blur_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -motion_blur_example_DEPENDENCIES = $(EXAMPLE_DEPS) -motion_blur_example_LDADD = $(EXAMPLE_LDADD) - -motion_stretch_example_SOURCES = $(examples_src_dir)/motion/motion-stretch-example.cpp -motion_stretch_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -motion_stretch_example_DEPENDENCIES = $(EXAMPLE_DEPS) -motion_stretch_example_LDADD = $(EXAMPLE_LDADD) - -new_window_example_SOURCES = $(examples_src_dir)/new-window/new-window-example.cpp -new_window_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -new_window_example_DEPENDENCIES = $(EXAMPLE_DEPS) -new_window_example_LDADD = $(EXAMPLE_LDADD) - -page_turn_view_example_SOURCES = $(examples_src_dir)/page-turn-view/page-turn-view-example.cpp -page_turn_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -page_turn_view_example_DEPENDENCIES = $(EXAMPLE_DEPS) -page_turn_view_example_LDADD = $(EXAMPLE_LDADD) - -radial_menu_example_SOURCES = $(examples_src_dir)/radial-menu/radial-menu-example.cpp \ - $(examples_src_dir)/radial-menu/radial-sweep-view.cpp \ - $(examples_src_dir)/radial-menu/radial-sweep-view-impl.cpp -radial_menu_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -radial_menu_example_DEPENDENCIES = $(EXAMPLE_DEPS) -radial_menu_example_LDADD = $(EXAMPLE_LDADD) - -refraction_effect_example_SOURCES = $(examples_src_dir)/shader-effect/refraction-effect-example.cpp -refraction_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -refraction_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS) -refraction_effect_example_LDADD = $(EXAMPLE_LDADD) - -scroll_view_example_SOURCES = $(examples_src_dir)/scroll-view/scroll-view-example.cpp -scroll_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -scroll_view_example_DEPENDENCIES = $(EXAMPLE_DEPS) -scroll_view_example_LDADD = $(EXAMPLE_LDADD) - -shadow_bone_lighting_example_SOURCES = $(examples_src_dir)/shadows/shadow-bone-lighting-example.cpp -shadow_bone_lighting_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -shadow_bone_lighting_example_DEPENDENCIES = $(EXAMPLE_DEPS) -shadow_bone_lighting_example_LDADD = $(EXAMPLE_LDADD) - -dali_builder_SOURCES = $(examples_src_dir)/builder/dali-builder.cpp -dali_builder_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -dali_builder_DEPENDENCIES = $(EXAMPLE_DEPS) -dali_builder_LDADD = $(EXAMPLE_LDADD) - -builder_example_SOURCES = $(examples_src_dir)/builder/examples.cpp -builder_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -builder_example_DEPENDENCIES = $(EXAMPLE_DEPS) -builder_example_LDADD = $(EXAMPLE_LDADD) - -image_scaling_irregular_grid_example_SOURCES = $(examples_src_dir)/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp -image_scaling_irregular_grid_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -image_scaling_irregular_grid_example_DEPENDENCIES = $(EXAMPLE_DEPS) -image_scaling_irregular_grid_example_LDADD = $(EXAMPLE_LDADD) - -buttons_example_SOURCES = $(examples_src_dir)/buttons/buttons-example.cpp -buttons_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -buttons_example_DEPENDENCIES = $(EXAMPLE_DEPS) -buttons_example_LDADD = $(EXAMPLE_LDADD) - -text_view_example_SOURCES = $(examples_src_dir)/text-view/text-view-example.cpp -text_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -text_view_example_DEPENDENCIES = $(EXAMPLE_DEPS) -text_view_example_LDADD = $(EXAMPLE_LDADD) - -logging_example_SOURCES = $(examples_src_dir)/logging/logging-example.cpp -logging_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS) -logging_example_DEPENDENCIES = $(EXAMPLE_DEPS) -logging_example_LDADD = $(EXAMPLE_LDADD) diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index ac5e455..7f85342 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -14,6 +14,7 @@ Requires(postun): /sbin/ldconfig Requires: dali Requires: dali-adaptor Requires: dali-toolkit +BuildRequires: cmake BuildRequires: boost-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(capi-appfw-application) @@ -47,13 +48,10 @@ CXXFLAGS+=" -Wall -g -O2" LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -fPIC" %ifarch %{arm} -EXTRA_CONFIGURE_OPTIONS=" --host=arm" CXXFLAGS+=" -D_ARCH_ARM_" %endif -libtoolize --force -cd %{_builddir}/%{name}-%{version}/build/tizen && autoreconf --install -cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_APP_DIR=%{dali_app_ro_dir} ./configure --prefix=$PREFIX $EXTRA_CONFIGURE_OPTIONS +cd %{_builddir}/%{name}-%{version}/build/tizen && cmake -DDALI_APP_DIR=%{dali_app_ro_dir} . make %{?jobs:-j%jobs} @@ -65,9 +63,6 @@ rm -rf %{buildroot} cd build/tizen %make_install DALI_APP_DIR=%{dali_app_ro_dir} -mkdir -p %{buildroot}/%{dali_app_exe_dir} -mv %{buildroot}/%{_bindir}/* %{buildroot}/%{dali_app_exe_dir} - mkdir -p %{buildroot}%{dali_xml_file_dir} cp -f %{_builddir}/%{name}-%{version}/%{name}.xml %{buildroot}%{dali_xml_file_dir} -- libgit2 0.21.4