Make dependency scene3d and etc so with dali2-csharp-binder

Since dali2-csharp-binder-scene3d doesn't know dali2-csharp-binder,
There was some problem if scene3d API have some exception.

(Since SWIG exception control system only works at dali2-csharp-binder)

To avoid this thing, let we add some dependency of scene3d and make we can call
common swig API.

Change-Id: I36f2eee68ca3ab6809dde716615cfe85aae99ee1
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 79921eb..1d4039b 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -176,9 +176,11 @@ IF( ENABLE_PKG_CONFIGURE )
   # @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
   SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} )
   SET( CORE_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-csharp-binder.pc )
+  SET( SCENE3D_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-csharp-binder-scene3d.pc )
   SET( PHYS2D_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-csharp-binder-physics-2d.pc )
   SET( PHYS3D_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-csharp-binder-physics-3d.pc )
   CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
+  CONFIGURE_FILE( ${SCENE3D_PKG_CFG_FILE}.in ${SCENE3D_PKG_CFG_FILE} @ONLY )
   CONFIGURE_FILE( ${PHYS2D_PKG_CFG_FILE}.in ${PHYS2D_PKG_CFG_FILE} @ONLY )
   CONFIGURE_FILE( ${PHYS3D_PKG_CFG_FILE}.in ${PHYS3D_PKG_CFG_FILE} @ONLY )
 ENDIF()
@@ -247,6 +249,7 @@ ENDIF()
 IF( ENABLE_PKG_CONFIGURE )
   INSTALL( FILES
     ${CORE_PKG_CFG_FILE}
+    ${SCENE3D_PKG_CFG_FILE}
     ${PHYS2D_PKG_CFG_FILE}
     ${PHYS3D_PKG_CFG_FILE}
     DESTINATION ${LIB_DIR}/pkgconfig )

diff --git a/build/tizen/dali-physics-2d/CMakeLists.txt b/build/tizen/dali-physics-2d/CMakeLists.txt
index c02de2f..1a75717 100644 (file)
--- a/build/tizen/dali-physics-2d/CMakeLists.txt
+++ b/build/tizen/dali-physics-2d/CMakeLists.txt
@@ -4,12 +4,19 @@ SET( PHYSICS_2D_SOURCES ${dali_csharp_binder_physics_2d_src_files})
 
 ADD_LIBRARY( ${PHYSICS_2D_TARGET} SHARED ${PHYSICS_2D_SOURCES} )
 
+# Add Dependency with dali2-csharp-binder.
+IF( ENABLE_PKG_CONFIGURE )
+  PKG_CHECK_MODULES(DALICSHARPBINDER REQUIRED ${name})
+ENDIF()
+
 TARGET_LINK_LIBRARIES( ${PHYSICS_2D_TARGET} PUBLIC
   ${DLOG_LDFLAGS}
   ${DALICORE_LDFLAGS}
   ${DALIADAPTOR_LDFLAGS}
   ${DALITOOLKIT_LDFLAGS}
-  ${DALIPHYSICS2D_LDFLAGS})
+  ${DALIPHYSICS2D_LDFLAGS}
+  ${DALICSHARPBINDER_LDFLAGS}
+)
 
 TARGET_COMPILE_OPTIONS( ${PHYSICS_2D_TARGET} PUBLIC
   ${DLOG_CFLAGS}
@@ -17,6 +24,7 @@ TARGET_COMPILE_OPTIONS( ${PHYSICS_2D_TARGET} PUBLIC
   ${DALIADAPTOR_CFLAGS}
   ${DALITOOLKIT_CFLAGS}
   ${DALIPHYSICS2D_CFLAGS}
+  ${DALICSHARPBINDER_LDFLAGS}
   ${DALI_PROFILE_CFLAGS}
   ${PHYSICS_2D_CFLAGS}
   ${}

diff --git a/build/tizen/dali-physics-3d/CMakeLists.txt b/build/tizen/dali-physics-3d/CMakeLists.txt
index 8997514..00debe5 100644 (file)
--- a/build/tizen/dali-physics-3d/CMakeLists.txt
+++ b/build/tizen/dali-physics-3d/CMakeLists.txt
@@ -6,12 +6,19 @@ ADD_COMPILE_OPTIONS( -Wno-unused-variable -Wno-reorder -Wno-sign-compare )
 
 ADD_LIBRARY( ${PHYSICS_3D_TARGET} SHARED ${PHYSICS_3D_SOURCES} )
 
+# Add Dependency with dali2-csharp-binder.
+IF( ENABLE_PKG_CONFIGURE )
+  PKG_CHECK_MODULES(DALICSHARPBINDER REQUIRED ${name})
+ENDIF()
+
 TARGET_LINK_LIBRARIES( ${PHYSICS_3D_TARGET} PUBLIC
   ${DLOG_LDFLAGS}
   ${DALICORE_LDFLAGS}
   ${DALIADAPTOR_LDFLAGS}
   ${DALITOOLKIT_LDFLAGS}
-  ${DALIPHYSICS3D_LDFLAGS})
+  ${DALIPHYSICS3D_LDFLAGS}
+  ${DALICSHARPBINDER_LDFLAGS}
+)
 
 TARGET_COMPILE_OPTIONS( ${PHYSICS_3D_TARGET} PUBLIC
   ${DLOG_CFLAGS}
@@ -19,6 +26,7 @@ TARGET_COMPILE_OPTIONS( ${PHYSICS_3D_TARGET} PUBLIC
   ${DALIADAPTOR_CFLAGS}
   ${DALITOOLKIT_CFLAGS}
   ${DALIPHYSICS3D_CFLAGS}
+  ${DALICSHARPBINDER_LDFLAGS}
   ${DALI_PROFILE_CFLAGS}
   ${PHYSICS_3D_CFLAGS}
   ${}

diff --git a/build/tizen/dali-scene3d/CMakeLists.txt b/build/tizen/dali-scene3d/CMakeLists.txt
index c1e0779..100e567 100755 (executable)
--- a/build/tizen/dali-scene3d/CMakeLists.txt
+++ b/build/tizen/dali-scene3d/CMakeLists.txt
@@ -4,12 +4,19 @@ SET( SCENE3D_SOURCES ${dali_csharp_binder_scene3d_src_files})
 
 ADD_LIBRARY( ${SCENE3D_TARGET} SHARED ${SCENE3D_SOURCES} )
 
+# Add Dependency with dali2-csharp-binder.
+IF( ENABLE_PKG_CONFIGURE )
+  PKG_CHECK_MODULES(DALICSHARPBINDER REQUIRED ${name})
+ENDIF()
+
 TARGET_LINK_LIBRARIES( ${SCENE3D_TARGET} PUBLIC
   ${DLOG_LDFLAGS}
   ${DALICORE_LDFLAGS}
   ${DALIADAPTOR_LDFLAGS}
   ${DALITOOLKIT_LDFLAGS}
-  ${DALISCENE3D_LDFLAGS})
+  ${DALISCENE3D_LDFLAGS}
+  ${DALICSHARPBINDER_LDFLAGS}
+)
 
 TARGET_COMPILE_OPTIONS( ${SCENE3D_TARGET} PUBLIC
   ${DLOG_CFLAGS}
@@ -17,6 +24,7 @@ TARGET_COMPILE_OPTIONS( ${SCENE3D_TARGET} PUBLIC
   ${DALIADAPTOR_CFLAGS}
   ${DALITOOLKIT_CFLAGS}
   ${DALISCENE3D_CFLAGS}
+  ${DALICSHARPBINDER_CFLAGS}
   ${DALI_PROFILE_CFLAGS}
   ${SCENE3D_CFLAGS}
   ${}

diff --git a/build/tizen/dali2-csharp-binder-scene3d.pc.in b/build/tizen/dali2-csharp-binder-scene3d.pc.in
new file mode 100644 (file)
index 0000000..b20ecbc
--- /dev/null
+++ b/build/tizen/dali2-csharp-binder-scene3d.pc.in
@@ -0,0 +1,14 @@
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@DALI_CSHARP_BINDER_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: DALi C# binder
+Description: DALi C# binder Library for Scene3D
+Version: ${apiversion}
+Requires: dali2-scene3d dali2-csharp-binder
+Libs: -L${libdir} -ldali2-csharp-binder-scene3d
+Cflags: -I${includedir}/dali-csharp-binder

diff --git a/build/tizen/dali2-csharp-binder.pc.in b/build/tizen/dali2-csharp-binder.pc.in
index 6d6b3dc..3f7e334 100644 (file)
--- a/build/tizen/dali2-csharp-binder.pc.in
+++ b/build/tizen/dali2-csharp-binder.pc.in
@@ -7,7 +7,7 @@ libdir=@LIB_DIR@
 includedir=@DEV_INCLUDE_PATH@
 
 Name: DALi C# binder
-Description: DALi C# binder Libaray
+Description: DALi C# binder Library
 Version: ${apiversion}
 Requires: dali2-core dali2-adaptor dali2-toolkit dali2-scene3d
 Libs: -L${libdir} -ldali2-csharp-binder