Removed direct-rendering example from vulkan build

Change-Id: Icca4b02279c7d43dc7cee2a14edb513b2d3483c3

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 55cca35659bc5ff1a3230ad9244566e5cc80dbfa..8c086cfad86f3c02d482f0506ce4b14378773519 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -19,6 +19,7 @@ OPTION(ENABLE_EXPORTALL          "Enable Export all symbols" OFF)
 OPTION(ENABLE_DEBUG              "Enable Debug" OFF)
 OPTION(ENABLE_TRACE              "Enable Trace" OFF)
 OPTION(ENABLE_PKG_CONFIGURE      "Use pkgconfig" ON)
+OPTION(ENABLE_VULKAN             "Use Vulkan instead of GLES" OFF)
 OPTION(INTERNATIONALIZATION      "Internationalization demo string names" ON)
 
 SET(ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..)

diff --git a/build/tizen/examples/CMakeLists.txt b/build/tizen/examples/CMakeLists.txt
index 7d02b15b5731315d2063a4162ced146e8436983a..0d397f161cef85fe8ebe486d78dc784d74e5cd1b 100644 (file)
--- a/build/tizen/examples/CMakeLists.txt
+++ b/build/tizen/examples/CMakeLists.txt
@@ -1,5 +1,11 @@
 SET(EXAMPLES_SRC_DIR ${ROOT_SRC_DIR}/examples)
 
+MESSAGE(STATUS "Building examples.")
+MESSAGE(STATUS "ENABLE_VULKAN: ${ENABLE_VULKAN}")
+MESSAGE(STATUS "ENABLE_PHYSICS_2D: ${ENABLE_PHYSICS_2D}")
+MESSAGE(STATUS "ENABLE_PHYSICS_3D: ${ENABLE_PHYSICS_3D}")
+MESSAGE(STATUS "ENABLE_SCENE3D: ${ENABLE_SCENE3D}")
+
 # Get all subdirectory names from EXAMPLES_SRC_DIR
 MACRO(SUBDIRLIST result curdir)
   FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
@@ -13,6 +19,8 @@ MACRO(SUBDIRLIST result curdir)
 ENDMACRO()
 SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
 
+MESSAGE(STATUS "Subdirs: ${SUBDIRS}")
+
 SET(SCENE3D_DIR "scene3d")
 IF (NOT "${ENABLE_SCENE3D}" )
   IF ( ${SCENE3D_DIR} IN_LIST SUBDIRS )
@@ -20,13 +28,21 @@ IF (NOT "${ENABLE_SCENE3D}" )
   ENDIF()
 ENDIF()
 
-SET(PHYSICS_2D_DIR "chipmunk")
+SET(PHYSICS_2D_DIR "chipmunk-physics")
 IF (NOT "${ENABLE_PHYSICS_2D}" )
   IF ( ${PHYSICS_2D_DIR} IN_LIST SUBDIRS )
     LIST( REMOVE_ITEM SUBDIRS ${PHYSICS_2D_DIR} )
   ENDIF()
 ENDIF()
 
+IF(ENABLE_VULKAN)
+  # Don't build GL examples
+  SET(GLES_EXAMPLES "direct-rendering")
+  IF( ${GLES_EXAMPLES} IN_LIST SUBDIRS)
+    LIST(REMOVE_ITEM SUBDIRS ${GLES_EXAMPLES})
+  ENDIF()
+ENDIF()
+
 FIND_PROGRAM( SHADER_GENERATOR "dali-shader-generator" )
 IF( NOT SHADER_GENERATOR )
   MESSAGE( FATAL_ERROR "dali-shader-generator not found!" )
@@ -34,9 +50,10 @@ ENDIF()
 
 FUNCTION(INSTALL_EXAMPLES EXAMPLE)
   SET(PARENT_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../")
-  FILE(GLOB_RECURSE SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
 
+  FILE(GLOB_RECURSE SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
   SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
+
   IF(SHARED)
     ADD_LIBRARY(${EXAMPLE}.example SHARED ${SRCS})
   ELSE()
@@ -45,21 +62,22 @@ FUNCTION(INSTALL_EXAMPLES EXAMPLE)
 
   IF(EXISTS ${EXAMPLES_SRC_DIR}/${EXAMPLE}/dependencies.cmake)
     INCLUDE( ${EXAMPLES_SRC_DIR}/${EXAMPLE}/dependencies.cmake OPTIONAL)
-  endif()
+  ENDIF()
 
   # Generate source files for shaders
   SET(SHADER_SOURCE_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/shaders/")
   IF (EXISTS ${SHADER_SOURCE_DIR})
     SET(SHADER_GENERATED_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/generated/")
     ADD_CUSTOM_TARGET(${EXAMPLE}-generate-shaders
-                      COMMAND ${SHADER_GENERATOR} --skip ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
+      COMMAND ${SHADER_GENERATOR} --skip ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
     SET_PROPERTY(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
-                "${SHADER_GENERATED_DIR}")
+      "${SHADER_GENERATED_DIR}")
     ADD_DEPENDENCIES(${EXAMPLE}.example ${EXAMPLE}-generate-shaders)
   ENDIF()
 
   TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_LIBS})
   INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})
+
 ENDFUNCTION()
 
 IF( NOT BUILD_EXAMPLE_NAME )

diff --git a/examples/direct-rendering/dependencies.cmake b/examples/direct-rendering/dependencies.cmake
new file mode 100644 (file)
index 0000000..74f98d0
--- /dev/null
+++ b/examples/direct-rendering/dependencies.cmake
@@ -0,0 +1,3 @@
+IF(ENABLE_VULKAN)
+  SET(EXAMPLE_DISABLED=1)
+ENDIF()