From 22279b5d10510237d148c8e0dbd0c6d060cba931 Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 19 Apr 2024 16:43:31 +0100 Subject: [PATCH] Revert "Make dependency scene3d and etc so with dali2-csharp-binder" This reverts commit 2616faef7723ce5f3b6139c13b6a6a6d230209bb. (it added a cyclic dependency and causes build break on clean system) Change-Id: Ib8778c99c9acf75de279c6cf3cc5c610c76d3470 --- build/tizen/CMakeLists.txt | 3 --- build/tizen/dali-physics-2d/CMakeLists.txt | 10 +--------- build/tizen/dali-physics-3d/CMakeLists.txt | 10 +--------- build/tizen/dali-scene3d/CMakeLists.txt | 10 +--------- build/tizen/dali2-csharp-binder-scene3d.pc.in | 14 -------------- build/tizen/dali2-csharp-binder.pc.in | 2 +- 6 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 build/tizen/dali2-csharp-binder-scene3d.pc.in diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 1d4039b..79921eb 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -176,11 +176,9 @@ 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() @@ -249,7 +247,6 @@ 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 1a75717..c02de2f 100644 --- a/build/tizen/dali-physics-2d/CMakeLists.txt +++ b/build/tizen/dali-physics-2d/CMakeLists.txt @@ -4,19 +4,12 @@ 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} - ${DALICSHARPBINDER_LDFLAGS} -) + ${DALIPHYSICS2D_LDFLAGS}) TARGET_COMPILE_OPTIONS( ${PHYSICS_2D_TARGET} PUBLIC ${DLOG_CFLAGS} @@ -24,7 +17,6 @@ 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 00debe5..8997514 100644 --- a/build/tizen/dali-physics-3d/CMakeLists.txt +++ b/build/tizen/dali-physics-3d/CMakeLists.txt @@ -6,19 +6,12 @@ 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} - ${DALICSHARPBINDER_LDFLAGS} -) + ${DALIPHYSICS3D_LDFLAGS}) TARGET_COMPILE_OPTIONS( ${PHYSICS_3D_TARGET} PUBLIC ${DLOG_CFLAGS} @@ -26,7 +19,6 @@ 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 100e567..c1e0779 100755 --- a/build/tizen/dali-scene3d/CMakeLists.txt +++ b/build/tizen/dali-scene3d/CMakeLists.txt @@ -4,19 +4,12 @@ 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} - ${DALICSHARPBINDER_LDFLAGS} -) + ${DALISCENE3D_LDFLAGS}) TARGET_COMPILE_OPTIONS( ${SCENE3D_TARGET} PUBLIC ${DLOG_CFLAGS} @@ -24,7 +17,6 @@ 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 deleted file mode 100644 index b20ecbc..0000000 --- a/build/tizen/dali2-csharp-binder-scene3d.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -# 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 3f7e334..6d6b3dc 100644 --- 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 Library +Description: DALi C# binder Libaray Version: ${apiversion} Requires: dali2-core dali2-adaptor dali2-toolkit dali2-scene3d Libs: -L${libdir} -ldali2-csharp-binder -- 2.7.4