[neon/backports-focal/draco/Neon/release] debian/patches: Revert "Export backwards-compatible CMake targets"

[Jonathan Riddell]

Git commit e634985b9f075b63f5444b0460faa8c4629bfc1a by Jonathan Riddell.
Committed on 15/12/2021 at 17:07.
Pushed by jriddell into branch 'Neon/release'.

Revert "Export backwards-compatible CMake targets"

This reverts commit 4b18dd565a2d19fe0c4eb895fb118575c690b3e7.

M  +10   -11   debian/patches/0003-Install-proper-CMake-targets.patch

https://invent.kde.org/neon/backports-focal/draco/commit/e634985b9f075b63f5444b0460faa8c4629bfc1a

diff --git a/debian/patches/0003-Install-proper-CMake-targets.patch b/debian/patches/0003-Install-proper-CMake-targets.patch
index d7ac601..1e4159c 100644
--- a/debian/patches/0003-Install-proper-CMake-targets.patch
+++ b/debian/patches/0003-Install-proper-CMake-targets.patch
@@ -3,25 +3,23 @@ Date: Sat, 11 Dec 2021 14:01:57 +0100
 Subject: Install proper CMake targets
 
 ---
- cmake/draco-config.cmake.template |  5 ++++-
- cmake/draco_install.cmake         | 14 +++++++++-----
- 2 files changed, 13 insertions(+), 6 deletions(-)
+ cmake/draco-config.cmake.template |  3 ++-
+ cmake/draco_install.cmake         | 15 ++++++++++-----
+ 2 files changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/cmake/draco-config.cmake.template b/cmake/draco-config.cmake.template
-index 913b1b0..f69c31a 100644
+index 913b1b0..2ad53e7 100644
 --- a/cmake/draco-config.cmake.template
 +++ b/cmake/draco-config.cmake.template
-@@ -1,4 +1,7 @@
+@@ -1,4 +1,5 @@
  @PACKAGE_INIT@
 +include("${CMAKE_CURRENT_LIST_DIR}/draco-targets.cmake")
  set_and_check(DRACO_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
  set_and_check(DRACO_LIB_DIR "@CMAKE_INSTALL_FULL_LIBDIR@")
 -set_and_check(DRACO_LIBRARY "draco")
-+set(DRACO_LIBRARY "draco::draco_shared")
-+add_library(draco INTERFACE IMPORTED)
-+set_target_properties(draco PROPERTIES INTERFACE_LINK_LIBRARIES "draco::draco_shared")
++set(DRACO_LIBRARY "draco")
 diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake
-index 6d2f3be..3b19192 100644
+index 6d2f3be..dc74147 100644
 --- a/cmake/draco_install.cmake
 +++ b/cmake/draco_install.cmake
 @@ -39,10 +39,10 @@ macro(draco_setup_install_target)
@@ -46,7 +44,7 @@ index 6d2f3be..3b19192 100644
  
    foreach(file ${draco_sources})
      if(file MATCHES "h$")
-@@ -81,11 +81,15 @@ macro(draco_setup_install_target)
+@@ -81,11 +81,16 @@ macro(draco_setup_install_target)
    if(MSVC)
      install(TARGETS draco DESTINATION "${libs_path}")
    else()
@@ -57,10 +55,11 @@ index 6d2f3be..3b19192 100644
      if(BUILD_SHARED_LIBS)
 -      install(TARGETS draco_shared DESTINATION "${libs_path}")
 +      target_include_directories(draco_shared INTERFACE ${DRACO_INCLUDE_DIR})
++      set_target_properties(draco_shared PROPERTIES EXPORT_NAME draco)
 +      install(TARGETS draco_shared EXPORT draco-targets DESTINATION "${libs_path}")
      endif()
 +
-+    install(EXPORT draco-targets NAMESPACE draco:: DESTINATION "${libs_path}/cmake/draco")
++    install(EXPORT draco-targets DESTINATION "${libs_path}/cmake/draco")
    endif()
  
    if(DRACO_UNITY_PLUGIN)