Peter M. Groen / dali-demo

Commit d2be74daa3c2702c825fcf8144874c07b75bab0a

Authored by Wander Lairson Costa
Committed by Adeel Kazmi
1 parent fd72b266

Support building on macOS 

Change-Id: Icf83a291c03bef8253d896be8a55454357554a83
Inline Side-by-side
Showing 2 changed files with 33 additions and 14 deletions
.gitignore
  View file @d2be74d
... ... @@ -72,4 +72,5 @@ simple-image-wall.js
72 72 /build/tizen/tests-reel/*.dir
73 73 /build/tizen/tests-reel/*.vcxproj
74 74 /build/tizen/tests-reel/*.vcxproj.filters
75   -
  75 +.clangd/
  76 +compile_commands.json
... ...
build/tizen/CMakeLists.txt
  View file @d2be74d
... ... @@ -25,6 +25,10 @@ SET(DEMO_SHARED ${CMAKE_SOURCE_DIR}/../../shared)
25 25  
26 26 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
27 27  
  28 +IF (APPLE)
  29 + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  30 +ENDIF()
  31 +
28 32 IF(DEFINED DALI_APP_DIR)
29 33 SET(BINDIR ${DALI_APP_DIR})
30 34 ELSE()
... ... @@ -227,10 +231,11 @@ ENDIF()
227 231  
228 232 SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
229 233  
230   -IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
231   - FIND_PACKAGE( pthreads REQUIRED )
  234 +IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
  235 + IF ( WIN32 )
  236 + FIND_PACKAGE( pthreads REQUIRED )
  237 + ENDIF()
232 238 FIND_PACKAGE( curl REQUIRED )
233   - FIND_LIBRARY( GETOPT_LIBRARY NAMES getopt )
234 239 FIND_LIBRARY( EXIF_LIBRARY NAMES libexif )
235 240  
236 241 FIND_PACKAGE( png REQUIRED )
... ... @@ -238,17 +243,20 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
238 243 FIND_PACKAGE( jpeg REQUIRED )
239 244 FIND_LIBRARY( TURBO_JPEG_LIBRARY NAMES turbojpeg )
240 245  
241   - FIND_PACKAGE( unofficial-fontconfig REQUIRED )
242 246 FIND_PACKAGE( freetype REQUIRED )
243 247 FIND_PACKAGE( harfbuzz REQUIRED )
244 248 FIND_LIBRARY( FRIBIDI_LIBRARY NAMES fribidi )
245 249  
246 250 FIND_PACKAGE( unofficial-angle REQUIRED )
247   - FIND_PACKAGE( unofficial-cairo REQUIRED )
248 251  
249 252 FIND_PACKAGE( WebP REQUIRED )
250 253  
251   - FIND_PACKAGE( dali-windows-dependencies REQUIRED )
  254 + IF ( WIN32 )
  255 + FIND_LIBRARY( GETOPT_LIBRARY NAMES getopt )
  256 + FIND_PACKAGE( dali-windows-dependencies REQUIRED )
  257 + FIND_PACKAGE( unofficial-cairo REQUIRED )
  258 + FIND_PACKAGE( unofficial-fontconfig REQUIRED )
  259 + ENDIF()
252 260 FIND_PACKAGE( dali2-core REQUIRED )
253 261 FIND_PACKAGE( dali2-adaptor REQUIRED )
254 262 FIND_PACKAGE( dali2-toolkit REQUIRED )
... ... @@ -273,29 +281,35 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
273 281 ENDIF()
274 282  
275 283 SET( REQUIRED_LIBS
276   - PThreads4W::PThreads4W
277 284 CURL::libcurl
278   - ${GETOPT_LIBRARY}
279 285 ${EXIF_LIBRARY}
280 286 ${PNG_LIBRARIES}
281 287 ${GIF_LIBRARIES}
282 288 JPEG::JPEG
283 289 ${TURBO_JPEG_LIBRARY}
284   - unofficial::fontconfig::fontconfig
285 290 Freetype::Freetype
286 291 harfbuzz::harfbuzz
287 292 ${FRIBIDI_LIBRARY}
288 293 unofficial::angle::libEGL
289 294 unofficial::angle::libGLESv2
290   - unofficial::cairo::cairo
291 295 WebP::webp
292 296 WebP::webpdemux
293   - dali-windows-dependencies::dali-windows-dependencies
294 297 dali2-core::dali2-core
295 298 dali2-adaptor::dali2-adaptor
296 299 dali2-toolkit::dali2-toolkit
297 300 )
298 301  
  302 + IF ( WIN32 )
  303 + SET( REQUIRED_LIBS
  304 + ${REQUIRED_LIBS}
  305 + ${GETOPT_LIBRARY}
  306 + unofficial::fontconfig::fontconfig
  307 + unofficial::cairo::cairo
  308 + PThreads4W::PThreads4W
  309 + dali-windows-dependencies::dali-windows-dependencies
  310 + )
  311 + ENDIF()
  312 +
299 313 IF (dali2_scene_loader_FOUND)
300 314 SET( REQUIRED_LIBS "${REQUIRED_LIBS} dali2-scene-loader::dali2-scene-loader" )
301 315 SET( ENABLE_SCENE_LOADER "ON" )
... ... @@ -331,7 +345,7 @@ IF (UNIX)
331 345  
332 346 FILE(GLOB PO_FILES RELATIVE "${PO_DIR}" "${PO_DIR}/*.po")
333 347  
334   - SET(MSGFMT "/usr/bin/msgfmt")
  348 + SET(MSGFMT "msgfmt")
335 349 SET(MO_FILES_DIR ${CMAKE_BINARY_DIR}/mo)
336 350 FILE(MAKE_DIRECTORY ${MO_FILES_DIR})
337 351  
... ... @@ -363,7 +377,11 @@ IF( WIN32 )
363 377 ADD_COMPILE_OPTIONS( /vmg ) # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks.
364 378 ADD_COMPILE_OPTIONS( /wd4251 ) # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'"
365 379 ELSE()
366   - SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE")
  380 + SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -Wall -fPIE")
  381 + # -Werror is disable for clang in dali-adaptor
  382 + IF ( NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" )
  383 + SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -Werror")
  384 + ENDIF()
367 385  
368 386 IF( NOT ${ENABLE_EXPORTALL} )
369 387 SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -fvisibility=hidden")
... ...