Fixes for the CMake build on MS-Windows.

Change-Id: I679b9909a6525406bb216d50557a93da9dfedc8e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index a83d807c8c0ce99bd2b0771e90a03afdf13f10b3..6f3856a6ac5545daf9cee5bce0049f7b3779a6c5 100644 (file)
--- 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 f22ceefcbe58eaf3b3cdc0accd3bbed3da52d395..c43bfebfa891070575a283b0ec22c84b08d95e4e 100644 (file)
--- 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 b190e237aa88a5e44c592da530c79d4e7e822a2f..fc992a433a37fac2cb813ac073258fda31b1026f 100644 (file)
--- 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
 )