From 88f6875e0faecb7a5a16f62760edd68ff563ac92 Mon Sep 17 00:00:00 2001
From: JamesOldfield <JamesOldfield@users.noreply.github.com>
Date: Sat, 9 Mar 2019 01:53:00 +0000
Subject: [PATCH] [pthreads] Add CMake config to support find_package(pthreads)
 (#4081)

* [pthreads] Add CMake config to support find_package(pthreads)

* [pthreads] Support find_package(pthreads)
---
 ports/pthreads/CMakeLists.txt | 17 ++++++++++-------
 ports/pthreads/CONTROL        |  2 +-
 ports/pthreads/portfile.cmake |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt
index b40c140373..32f25e7165 100644
--- a/ports/pthreads/CMakeLists.txt
+++ b/ports/pthreads/CMakeLists.txt
@@ -197,17 +197,20 @@ set(PTHREADS_COMPILER V)
 
 set(PTHREADS_LIBRARY "pthread${PTHREADS_COMPILER}${PTHREADS_EXCEPTION_SCHEME}${PTHREADS_COMPATIBILITY_VERSION}")
 
-include_directories(.)
-
-add_library(${PTHREADS_LIBRARY} ${PTHREAD_SOURCES})
+add_library(pthreads ${PTHREAD_SOURCES})
+target_include_directories(pthreads PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+set_target_properties(pthreads PROPERTIES OUTPUT_NAME ${PTHREADS_LIBRARY})
+if(NOT DISABLE_INSTALL_HEADERS)
+  set_property(TARGET pthreads PROPERTY PUBLIC_HEADER ${PTHREAD_PUBLIC_HEADERS})
+endif()
 
 install(
-  TARGETS  ${PTHREADS_LIBRARY}
+  TARGETS pthreads EXPORT pthreads-config
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
+  PUBLIC_HEADER DESTINATION include
+  INCLUDES DESTINATION include
 )
+install(EXPORT pthreads-config DESTINATION share/pthreads)
 
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES ${PTHREAD_PUBLIC_HEADERS} DESTINATION include)
-endif()
diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL
index 9abc926f9d..d22280d909 100644
--- a/ports/pthreads/CONTROL
+++ b/ports/pthreads/CONTROL
@@ -1,3 +1,3 @@
 Source: pthreads
-Version: 2.9.1-4
+Version: 2.9.1-5
 Description: pthreads for windows
diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake
index 18627aba17..43489adb6b 100644
--- a/ports/pthreads/portfile.cmake
+++ b/ports/pthreads/portfile.cmake
@@ -26,6 +26,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets()
+
 vcpkg_copy_pdbs()
 
 file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/*.h")