From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Mon, 28 Dec 2020 19:40:33 +0000 (+0000)
Subject: (Max OSX Build) Use vcpkg cairo & enable scene-loader
X-Git-Tag: dali_2.0.8~3^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ff4a7ae4121b58d8a4201b49699819c61ec17120

(Max OSX Build) Use vcpkg cairo & enable scene-loader

Change-Id: I65e706765203bcaa3e824afdd56becd60b0ac37c
---

diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index f52387f..e59a17f 100644
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -1,2 +1,5 @@
 build
 dali.info
+*.dylib
+dali2-*-config.cmake
+libdali2-scene-loader.so*
\ No newline at end of file
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index c01a484..63352ba 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -303,11 +303,11 @@ IF( WIN32 OR APPLE )
 
   FIND_PACKAGE( unofficial-angle REQUIRED )
 
-  IF ( WIN32 )
+  IF(WIN32)
     FIND_PACKAGE( unofficial-fontconfig REQUIRED )
-    FIND_PACKAGE( unofficial-cairo REQUIRED )
   ENDIF()
 
+  FIND_PACKAGE( unofficial-cairo REQUIRED )
   FIND_PACKAGE( WebP REQUIRED )
 
   SET( DALIADAPTOR_LDFLAGS
diff --git a/build/tizen/dali-scene-loader/CMakeLists.txt b/build/tizen/dali-scene-loader/CMakeLists.txt
index 2e2cc38..dcab4a3 100644
--- a/build/tizen/dali-scene-loader/CMakeLists.txt
+++ b/build/tizen/dali-scene-loader/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
 set(name "dali2-scene-loader")
 
 project(${name} CXX)
@@ -144,7 +144,49 @@ if( ANDROID )
 	target_link_libraries(${name} log)
 endif()
 
-install(TARGETS ${name} DESTINATION ${LIB_DIR})
+IF( INSTALL_CMAKE_MODULES )
+	SET_TARGET_PROPERTIES( ${name}
+		PROPERTIES
+		VERSION ${DALI_SCENE_LOADER_VERSION}
+		SOVERSION ${${name}_VERSION_MAJOR}
+		CLEAN_DIRECT_OUPUT 1
+	)
+
+	IF( ENABLE_DEBUG )
+		SET( BIN_DIR "${BIN_DIR}/debug" )
+		SET( LIB_DIR "${LIB_DIR}/debug" )
+	ENDIF()
+
+	# Install the library files.
+	INSTALL( TARGETS ${name}
+		EXPORT ${name}-targets
+		LIBRARY DESTINATION ${LIB_DIR}
+		ARCHIVE DESTINATION ${LIB_DIR}
+		RUNTIME DESTINATION ${BIN_DIR}
+	)
+
+	# Install the cmake modules.
+	INSTALL(
+		EXPORT ${name}-targets
+		NAMESPACE ${name}::
+		FILE ${name}-targets.cmake
+		DESTINATION share/${name}
+	)
+
+	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake "
+		include(CMakeFindDependencyMacro)
+		include(\${CMAKE_CURRENT_LIST_DIR}/${name}-targets.cmake)
+	")
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake DESTINATION share/${name})
+
+	# Install the pdb file.
+	IF( ENABLE_DEBUG AND WIN32 )
+		install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
+	ENDIF()
+ELSE()
+	# Install the library so file and symlinks
+	INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} )
+ENDIF()
 
 file(GLOB scene_loader_include_files ${scene_loader_public_api_dir})
 install(DIRECTORY ${scene_loader_include_files}