diff options
| author | Adam Bialogonski <adam.b@samsung.com> | 2024-07-16 16:30:03 +0100 |
|---|---|---|
| committer | Adam Bialogonski <adam.b@samsung.com> | 2024-07-16 16:30:03 +0100 |
| commit | 9a603f7aec286ee49ccf6fb5693e366e65d75b96 (patch) | |
| tree | 65ba981764e8d3b7017aff11ecf579433eacffa8 | |
| parent | 9858d734558b2ca4bac913c5a036e1f3d9b946d2 (diff) | |
| download | dali-adaptor-9a603f7aec286ee49ccf6fb5693e366e65d75b96.tar.gz dali-adaptor-9a603f7aec286ee49ccf6fb5693e366e65d75b96.tar.bz2 dali-adaptor-9a603f7aec286ee49ccf6fb5693e366e65d75b96.zip | |
Vulkan GLSLang library dependency for Vulkan build
Change-Id: I84aae51cdd286544c7c308ccabb10e104c2bc464
| -rw-r--r-- | build/tizen/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | build/tizen/deps-check.cmake | 25 | ||||
| -rw-r--r-- | packaging/dali-adaptor.spec | 3 |
3 files changed, 25 insertions, 5 deletions
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index e0fcafd8f..3cd079404 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -461,7 +461,7 @@ MESSAGE( STATUS "CMAKE_SYSROOT: ${CMAKE_SYSROOT}") MESSAGE( STATUS "CMAKE_SYSTEM_INCLUDE_PATH: ${CMAKE_SYSTEM_INCLUDE_PATH}") MESSAGE( STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}") MESSAGE( STATUS "Vulkan: ${ENABLE_VULKAN}") - +MESSAGE( STATUS "Vulkan GLSLang: ${ENABLE_GLSLANG}") IF( enable_feedback ) ADD_SUBDIRECTORY( plugins ) diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake index ca2b7dbe8..fc3bb9f24 100755 --- a/build/tizen/deps-check.cmake +++ b/build/tizen/deps-check.cmake @@ -27,10 +27,16 @@ ARG_ENABLE( ENABLE_RENAME_SO enable_rename_so "${ENABLE_VAL};1" "Specify whether ARG_ENABLE( ENABLE_COVERAGE enable_coverage "${ENABLE_VAL}" "Enables coverage" ) ARG_ENABLE( ENABLE_VULKAN enable_vulkan "${ENABLE_VAL}" "Enables Vulkan build") +ARG_ENABLE( ENABLE_GLSLANG enable_glslang "${ENABLE_VAL}" "Enables Vulkan GLSLang") # help option ARG_ENABLE( PRINT_HELP print_help "${ENABLE_VAL}" "Prints help" ) +# If Vulkan is enabled GLSLang is used by default +IF( ENABLE_VULKAN ) + SET(enable_glslang ON) +ENDIF() + IF( print_help ) MESSAGE( STATUS ${HELP_ENABLES} ) EXIT() @@ -114,6 +120,7 @@ CHECK_MODULE_AND_SET( VCONF vconf [] ) CHECK_MODULE_AND_SET( LIBUV libuv [] ) CHECK_MODULE_AND_SET( GLIB glib-2.0 [] ) CHECK_MODULE_AND_SET( VULKAN vulkan [] ) +CHECK_MODULE_AND_SET( GLSLANG glslang [] ) CHECK_MODULE_AND_SET( X11 x11 [] ) CHECK_MODULE_AND_SET( XCB x11-xcb [] ) CHECK_MODULE_AND_SET( XDAMAGE xdamage [] ) @@ -316,7 +323,7 @@ SET( DALI_CFLAGS ) IF (NOT APPLE) - # Default set of linked librarires + # Default set of linked libraries SET( DALI_LDFLAGS ${DALICORE_LDFLAGS} ${OPENGLES20_LDFLAGS} @@ -342,9 +349,6 @@ IF (NOT APPLE) -lturbojpeg -ljpeg ) -IF(VULKAN_ENABLED) - SET( DALI_LDFLAGS $DALI_LDFLAGS, ${VULKAN_LDFLAGS}) -ENDIF() if( NOT ANDROID_PROFILE ) SET( DALI_LDFLAGS ${DALI_LDFLAGS} @@ -516,6 +520,19 @@ IF(enable_vulkan) SET(DALI_LDFLAGS ${DALI_LDFLAGS} ${VULKAN_LDFLAGS} ) ENDIF() +IF(enable_glslang) + # glsllang-dev package on Ubuntu seems to be broken and doesn't + # provide valid cmake config files. On Tizen cmake files are valid + # but there's no pkg-config files so we handle both ways of obtaining + # package configuration. + IF(NOT GLSLANG_LDFLAGS) + FIND_PACKAGE(glslang) + SET(DALI_LDFLAGS ${DALI_LDFLAGS} glslang::glslang ) + ELSE() + SET(DALI_LDFLAGS ${DALI_LDFLAGS} ${GLSLANG_LDFLAGS} ) + ENDIF() +ENDIF() + IF(LIBUV_X11_PROFILE) SET(DALI_CFLAGS ${DALI_CFLAGS} ${LIBUV_CFLAGS}) SET(DALI_LDFLAGS ${DALI_LDFLAGS} ${LIBUV_LDFLAGS}) diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 03c417168..8e3281a44 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -73,6 +73,9 @@ BuildRequires: pkgconfig(input-method-client) BuildRequires: wayland-devel BuildRequires: wayland-extension-client-devel +BuildRequires: glslang-devel +BuildRequires: glslang + # WebP support only from Tizen 6 onwards %if 0%{?tizen_version_major} >= 6 BuildRequires: pkgconfig(libwebp) |