From 940e50563f8587b98d29d9afceb6950aa109dc96 Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Fri, 26 Jun 2020 15:40:40 +0100 Subject: [PATCH] Fixes for the CMake build on MS-Windows. Change-Id: I679b9909a6525406bb216d50557a93da9dfedc8e Signed-off-by: Victor Cebollada --- build/tizen/CMakeLists.txt | 2 -- build/tizen/deps-check.cmake | 2 ++ build/tizen/profiles/windows-profile.cmake | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index a83d807..6f3856a 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -176,8 +176,6 @@ IF( UNIX ) ENDIF() ENDIF() -SET( REQUIRED_LIBS ${REQUIRED_LIBS} webp webpdemux ) - TARGET_LINK_LIBRARIES( ${name} ${DALI_LDFLAGS} ${REQUIRED_LIBS} diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake index f22ceef..c43bfeb 100644 --- a/build/tizen/deps-check.cmake +++ b/build/tizen/deps-check.cmake @@ -274,6 +274,8 @@ SET( DALI_LDFLAGS -lgif -lturbojpeg -ljpeg + -lwebp + -lwebpdemux ) # Android includes pthread with android lib diff --git a/build/tizen/profiles/windows-profile.cmake b/build/tizen/profiles/windows-profile.cmake index b190e23..fc992a4 100644 --- a/build/tizen/profiles/windows-profile.cmake +++ b/build/tizen/profiles/windows-profile.cmake @@ -63,6 +63,8 @@ FIND_LIBRARY( FRIBIDI_LIBRARY NAMES fribidi ) FIND_PACKAGE( unofficial-angle REQUIRED ) FIND_PACKAGE( unofficial-cairo REQUIRED ) +FIND_PACKAGE( WebP REQUIRED ) + # Set the linker flags SET( REQUIRED_LIBS PThreads4W::PThreads4W @@ -81,4 +83,6 @@ SET( REQUIRED_LIBS unofficial::angle::libGLESv2 unofficial::cairo::cairo dali-core::dali-core + WebP::webp + WebP::webpdemux ) -- 2.7.4