Peter M. Groen / dali-demo

Commit 50ea4d7c665d2ef1103811140a379650fde66054

Authored by Adeel Kazmi
1 parent d2be74da

(Mac OSX Build) Use vcpkg cairo & fixed scene-loader build 

Change-Id: I66647e1c7214a7987a7f2ec9eb99f3dc9429c468
Inline Side-by-side
Showing 1 changed file with 8 additions and 3 deletions
build/tizen/CMakeLists.txt
  View file @50ea4d7
... ... @@ -248,15 +248,16 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
248 248 FIND_LIBRARY( FRIBIDI_LIBRARY NAMES fribidi )
249 249  
250 250 FIND_PACKAGE( unofficial-angle REQUIRED )
  251 + FIND_PACKAGE( unofficial-cairo REQUIRED )
251 252  
252 253 FIND_PACKAGE( WebP REQUIRED )
253 254  
254 255 IF ( WIN32 )
255 256 FIND_LIBRARY( GETOPT_LIBRARY NAMES getopt )
256 257 FIND_PACKAGE( dali-windows-dependencies REQUIRED )
257   - FIND_PACKAGE( unofficial-cairo REQUIRED )
258 258 FIND_PACKAGE( unofficial-fontconfig REQUIRED )
259 259 ENDIF()
  260 +
260 261 FIND_PACKAGE( dali2-core REQUIRED )
261 262 FIND_PACKAGE( dali2-adaptor REQUIRED )
262 263 FIND_PACKAGE( dali2-toolkit REQUIRED )
... ... @@ -310,8 +311,11 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
310 311 )
311 312 ENDIF()
312 313  
313   - IF (dali2_scene_loader_FOUND)
314   - SET( REQUIRED_LIBS "${REQUIRED_LIBS} dali2-scene-loader::dali2-scene-loader" )
  314 + IF (dali2-scene-loader_FOUND)
  315 + SET(REQUIRED_LIBS
  316 + ${REQUIRED_LIBS}
  317 + dali2-scene-loader::dali2-scene-loader
  318 + )
315 319 SET( ENABLE_SCENE_LOADER "ON" )
316 320 ENDIF()
317 321 ELSEIF( UNIX )
... ... @@ -425,3 +429,4 @@ MESSAGE( " Folder DEMO_SCRIPT_DIR : [" ${DEMO_SCRIPT_DIR} "]" )
425 429 MESSAGE( " Folder DEMO_LOCALE_DIR : [" ${DEMO_LOCALE_DIR} "]" )
426 430 MESSAGE( " Folder DEMO_EXAMPLE_BIN : [" ${DEMO_EXAMPLE_BIN} "]" )
427 431 MESSAGE( " Folder DEMO_LANG : [" ${DEMO_LANG} "]" )
  432 +MESSAGE( " Scene Loader Enabled : [" ${ENABLE_SCENE_LOADER} "]" )
... ...