Peter M. Groen / dali-demo

Commit c4905d02af9d56cb77f77c5e0229277e05ca21f0

Authored by David Steele
Committed by Gerrit Code Review
2 parents c2c5a06b ea4d7cb2

Merge "Removed direct-rendering example from vulkan build" into devel/master

Inline Side-by-side
Showing 3 changed files with 27 additions and 5 deletions
build/tizen/CMakeLists.txt
  View file @c4905d0
@@ -19,6 +19,7 @@ OPTION(ENABLE_EXPORTALL "Enable Export all symbols" OFF) @@ -19,6 +19,7 @@ OPTION(ENABLE_EXPORTALL "Enable Export all symbols" OFF)
19 OPTION(ENABLE_DEBUG "Enable Debug" OFF) 19 OPTION(ENABLE_DEBUG "Enable Debug" OFF)
20 OPTION(ENABLE_TRACE "Enable Trace" OFF) 20 OPTION(ENABLE_TRACE "Enable Trace" OFF)
21 OPTION(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON) 21 OPTION(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
  22 +OPTION(ENABLE_VULKAN "Use Vulkan instead of GLES" OFF)
22 OPTION(INTERNATIONALIZATION "Internationalization demo string names" ON) 23 OPTION(INTERNATIONALIZATION "Internationalization demo string names" ON)
23 24
24 SET(ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) 25 SET(ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..)
build/tizen/examples/CMakeLists.txt
  View file @c4905d0
1 SET(EXAMPLES_SRC_DIR ${ROOT_SRC_DIR}/examples) 1 SET(EXAMPLES_SRC_DIR ${ROOT_SRC_DIR}/examples)
2 2
  3 +MESSAGE(STATUS "Building examples.")
  4 +MESSAGE(STATUS "ENABLE_VULKAN: ${ENABLE_VULKAN}")
  5 +MESSAGE(STATUS "ENABLE_PHYSICS_2D: ${ENABLE_PHYSICS_2D}")
  6 +MESSAGE(STATUS "ENABLE_PHYSICS_3D: ${ENABLE_PHYSICS_3D}")
  7 +MESSAGE(STATUS "ENABLE_SCENE3D: ${ENABLE_SCENE3D}")
  8 +
3 # Get all subdirectory names from EXAMPLES_SRC_DIR 9 # Get all subdirectory names from EXAMPLES_SRC_DIR
4 MACRO(SUBDIRLIST result curdir) 10 MACRO(SUBDIRLIST result curdir)
5 FILE(GLOB children RELATIVE ${curdir} ${curdir}/*) 11 FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
@@ -13,6 +19,8 @@ MACRO(SUBDIRLIST result curdir) @@ -13,6 +19,8 @@ MACRO(SUBDIRLIST result curdir)
13 ENDMACRO() 19 ENDMACRO()
14 SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR}) 20 SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
15 21
  22 +MESSAGE(STATUS "Subdirs: ${SUBDIRS}")
  23 +
16 SET(SCENE3D_DIR "scene3d") 24 SET(SCENE3D_DIR "scene3d")
17 IF (NOT "${ENABLE_SCENE3D}" ) 25 IF (NOT "${ENABLE_SCENE3D}" )
18 IF ( ${SCENE3D_DIR} IN_LIST SUBDIRS ) 26 IF ( ${SCENE3D_DIR} IN_LIST SUBDIRS )
@@ -20,13 +28,21 @@ IF (NOT "${ENABLE_SCENE3D}" ) @@ -20,13 +28,21 @@ IF (NOT "${ENABLE_SCENE3D}" )
20 ENDIF() 28 ENDIF()
21 ENDIF() 29 ENDIF()
22 30
23 -SET(PHYSICS_2D_DIR "chipmunk") 31 +SET(PHYSICS_2D_DIR "chipmunk-physics")
24 IF (NOT "${ENABLE_PHYSICS_2D}" ) 32 IF (NOT "${ENABLE_PHYSICS_2D}" )
25 IF ( ${PHYSICS_2D_DIR} IN_LIST SUBDIRS ) 33 IF ( ${PHYSICS_2D_DIR} IN_LIST SUBDIRS )
26 LIST( REMOVE_ITEM SUBDIRS ${PHYSICS_2D_DIR} ) 34 LIST( REMOVE_ITEM SUBDIRS ${PHYSICS_2D_DIR} )
27 ENDIF() 35 ENDIF()
28 ENDIF() 36 ENDIF()
29 37
  38 +IF(ENABLE_VULKAN)
  39 + # Don't build GL examples
  40 + SET(GLES_EXAMPLES "direct-rendering")
  41 + IF( ${GLES_EXAMPLES} IN_LIST SUBDIRS)
  42 + LIST(REMOVE_ITEM SUBDIRS ${GLES_EXAMPLES})
  43 + ENDIF()
  44 +ENDIF()
  45 +
30 FIND_PROGRAM( SHADER_GENERATOR "dali-shader-generator" ) 46 FIND_PROGRAM( SHADER_GENERATOR "dali-shader-generator" )
31 IF( NOT SHADER_GENERATOR ) 47 IF( NOT SHADER_GENERATOR )
32 MESSAGE( FATAL_ERROR "dali-shader-generator not found!" ) 48 MESSAGE( FATAL_ERROR "dali-shader-generator not found!" )
@@ -34,9 +50,10 @@ ENDIF() @@ -34,9 +50,10 @@ ENDIF()
34 50
35 FUNCTION(INSTALL_EXAMPLES EXAMPLE) 51 FUNCTION(INSTALL_EXAMPLES EXAMPLE)
36 SET(PARENT_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../") 52 SET(PARENT_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../")
37 - FILE(GLOB_RECURSE SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")  
38 53
  54 + FILE(GLOB_RECURSE SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
39 SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp") 55 SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
  56 +
40 IF(SHARED) 57 IF(SHARED)
41 ADD_LIBRARY(${EXAMPLE}.example SHARED ${SRCS}) 58 ADD_LIBRARY(${EXAMPLE}.example SHARED ${SRCS})
42 ELSE() 59 ELSE()
@@ -45,21 +62,22 @@ FUNCTION(INSTALL_EXAMPLES EXAMPLE) @@ -45,21 +62,22 @@ FUNCTION(INSTALL_EXAMPLES EXAMPLE)
45 62
46 IF(EXISTS ${EXAMPLES_SRC_DIR}/${EXAMPLE}/dependencies.cmake) 63 IF(EXISTS ${EXAMPLES_SRC_DIR}/${EXAMPLE}/dependencies.cmake)
47 INCLUDE( ${EXAMPLES_SRC_DIR}/${EXAMPLE}/dependencies.cmake OPTIONAL) 64 INCLUDE( ${EXAMPLES_SRC_DIR}/${EXAMPLE}/dependencies.cmake OPTIONAL)
48 - endif() 65 + ENDIF()
49 66
50 # Generate source files for shaders 67 # Generate source files for shaders
51 SET(SHADER_SOURCE_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/shaders/") 68 SET(SHADER_SOURCE_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/shaders/")
52 IF (EXISTS ${SHADER_SOURCE_DIR}) 69 IF (EXISTS ${SHADER_SOURCE_DIR})
53 SET(SHADER_GENERATED_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/generated/") 70 SET(SHADER_GENERATED_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/generated/")
54 ADD_CUSTOM_TARGET(${EXAMPLE}-generate-shaders 71 ADD_CUSTOM_TARGET(${EXAMPLE}-generate-shaders
55 - COMMAND ${SHADER_GENERATOR} --skip ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR}) 72 + COMMAND ${SHADER_GENERATOR} --skip ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
56 SET_PROPERTY(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES 73 SET_PROPERTY(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
57 - "${SHADER_GENERATED_DIR}") 74 + "${SHADER_GENERATED_DIR}")
58 ADD_DEPENDENCIES(${EXAMPLE}.example ${EXAMPLE}-generate-shaders) 75 ADD_DEPENDENCIES(${EXAMPLE}.example ${EXAMPLE}-generate-shaders)
59 ENDIF() 76 ENDIF()
60 77
61 TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_LIBS}) 78 TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_LIBS})
62 INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR}) 79 INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})
  80 +
63 ENDFUNCTION() 81 ENDFUNCTION()
64 82
65 IF( NOT BUILD_EXAMPLE_NAME ) 83 IF( NOT BUILD_EXAMPLE_NAME )
examples/direct-rendering/dependencies.cmake 0 → 100644
  View file @c4905d0
  1 +IF(ENABLE_VULKAN)
  2 + SET(EXAMPLE_DISABLED=1)
  3 +ENDIF()