From 9781bea65e38ad0c48b205a3d48c992984ed1bdc Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Thu, 12 Sep 2019 19:09:29 +0200
Subject: [PATCH] [tinkerforge] Fix some issues.  (#8148)

* [tinkerforge] fix error with config (wrong include path) and missing dependencies.
---
 ports/tinkerforge/CMakeLists.txt             | 25 ++++++++++++--------
 ports/tinkerforge/portfile.cmake             |  2 +-
 ports/tinkerforge/tinkerforgeConfig.cmake.in |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ports/tinkerforge/CMakeLists.txt b/ports/tinkerforge/CMakeLists.txt
index 671f7d145..3cd991650 100644
--- a/ports/tinkerforge/CMakeLists.txt
+++ b/ports/tinkerforge/CMakeLists.txt
@@ -5,19 +5,18 @@ if(WIN32)
     set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
 endif()
 
+project(tinkerforge LANGUAGES C VERSION 2.1.25)
+
+if(NOT CONFIG_INSTALL_DIR)
+    set(CONFIG_INSTALL_DIR "share/${PROJECT_NAME}/")
+endif()
+if(NOT INCLUDE_INSTALL_DIR)
+    set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
+endif()
 if(NOT TARGET_INSTALL_DIR)
     set(TARGET_INSTALL_DIR "share/${PROJECT_NAME}")
 endif()
 
-if(NOT CONFIG_INSTALL_DIR)
-    set(CONFIG_INSTALL_DIR "share/${PROJECT_NAME}")
-endif()
-
-if(NOT INCLUDE_INSTALL_DIR)
-    set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
-endif()
-
-project(tinkerforge LANGUAGES C VERSION 2.1.25)
 
 file(GLOB CPP_FILES source/*.c)
 file(GLOB H_FILES source/*.h)
@@ -27,7 +26,13 @@ add_library(${PROJECT_NAME} ${CPP_FILES} ${H_FILES} ${DEF_FILE})
 target_include_directories(${PROJECT_NAME} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source>
     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}>)
-target_link_libraries(${PROJECT_NAME} PUBLIC Ws2_32)
+    
+find_package(Threads)
+target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)
+
+if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
+    target_link_libraries(${PROJECT_NAME} PUBLIC Ws2_32 advapi32)
+endif()
 ##---------------------------------------------------------------------------------------##
 ##----- Package definition. 
 ##---------------------------------------------------------------------------------------##
diff --git a/ports/tinkerforge/portfile.cmake b/ports/tinkerforge/portfile.cmake
index 128f72e32..cfc5c3989 100644
--- a/ports/tinkerforge/portfile.cmake
+++ b/ports/tinkerforge/portfile.cmake
@@ -24,7 +24,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share)
+vcpkg_fixup_cmake_targets()
 
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
diff --git a/ports/tinkerforge/tinkerforgeConfig.cmake.in b/ports/tinkerforge/tinkerforgeConfig.cmake.in
index 440db8a6c..07b771c65 100644
--- a/ports/tinkerforge/tinkerforgeConfig.cmake.in
+++ b/ports/tinkerforge/tinkerforgeConfig.cmake.in
@@ -1,5 +1,5 @@
 @PACKAGE_INIT@
 
-include ("@PACKAGE_TARGET_INSTALL_DIR@@PROJECT_NAME@Targets.cmake")
-set_and_check(REFL_ENUM_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+include ("@PACKAGE_TARGET_INSTALL_DIR@/@PROJECT_NAME@Targets.cmake")
+set_and_check(TINKERFORGE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
 check_required_components("@PROJECT_NAME@")