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 a04fa43..36fdf77 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 e3b8147..93a43ca 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 e32175e..665e3d9 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
@@ -80,5 +82,7 @@ SET( REQUIRED_LIBS
         unofficial::angle::libEGL
         unofficial::angle::libGLESv2
         unofficial::cairo::cairo
+        WebP::webp
+        WebP::webpdemux
         dali2-core::dali2-core
 )