diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-05-23 21:40:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 21:40:12 -0700 |
| commit | 59b28986bfb2f9e813c578f508cc0786f8b2eb92 (patch) | |
| tree | a620e15d652175a12479350cb2eb10648d5663d5 | |
| parent | 9c54cc9fab9d1725784118143eac2bb86fb4a47e (diff) | |
| parent | 7efe76a239c0df1650a6e9cbd01396237888a9ac (diff) | |
| download | vcpkg-59b28986bfb2f9e813c578f508cc0786f8b2eb92.tar.gz vcpkg-59b28986bfb2f9e813c578f508cc0786f8b2eb92.zip | |
Merge pull request #6587 from ivysnow/concurrentqueue
[concurrentqueue]update to 1.0.0-beta-dea078c with cmake target
| -rw-r--r-- | ports/concurrentqueue/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | ports/concurrentqueue/CONTROL | 2 | ||||
| -rw-r--r-- | ports/concurrentqueue/portfile.cmake | 22 | ||||
| -rw-r--r-- | ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake | 6 |
4 files changed, 38 insertions, 3 deletions
diff --git a/ports/concurrentqueue/CMakeLists.txt b/ports/concurrentqueue/CMakeLists.txt new file mode 100644 index 000000000..99de84178 --- /dev/null +++ b/ports/concurrentqueue/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.5)
+project(concurrentqueue C)
+
+add_library(concurrentqueue INTERFACE)
+
+target_include_directories(concurrentqueue INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
+
+install(TARGETS concurrentqueue
+ EXPORT concurrentqueue
+)
+install(EXPORT concurrentqueue FILE unofficial-concurrentqueue-targets.cmake NAMESPACE unofficial::concurrentqueue:: DESTINATION share/unofficial-concurrentqueue)
diff --git a/ports/concurrentqueue/CONTROL b/ports/concurrentqueue/CONTROL index 2dea27277..34080b423 100644 --- a/ports/concurrentqueue/CONTROL +++ b/ports/concurrentqueue/CONTROL @@ -1,3 +1,3 @@ Source: concurrentqueue -Version: 1.0.0-beta +Version: 1.0.0-beta-dea078c Description: A fast multi-producer, multi-consumer lock-free concurrent queue for C++11 diff --git a/ports/concurrentqueue/portfile.cmake b/ports/concurrentqueue/portfile.cmake index 1d0de7d05..29069c153 100644 --- a/ports/concurrentqueue/portfile.cmake +++ b/ports/concurrentqueue/portfile.cmake @@ -4,11 +4,29 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cameron314/concurrentqueue - REF 1d60c7f3004a87eaa9d9cbd647d66361c868558f - SHA512 4b435843291f4db5be6d3fb3dd33c38a1c3c0a2e2c22910b819f119cfca2867116c5d01dd5e7d302693d467821688aac5dc7334b4a9ef39275e682f1fb99585c + REF dea078cf5b6e742cd67a0d725e36f872feca4de4 + SHA512 edd47bcc025ffab7ac62cea168a9672a20cdbe139267426e97553fa1c796f1547d8414915518ee6be34a68d05e8a8171291f958c5eac0434ea8ba953bff85dbe HEAD_REF master ) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-concurrentqueue TARGET_PATH share/unofficial-concurrentqueue) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-config.in.cmake + ${CURRENT_PACKAGES_DIR}/share/unofficial-concurrentqueue/unofficial-concurrentqueue-config.cmake + @ONLY +) + file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrentqueue RENAME copyright) file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) diff --git a/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake b/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake new file mode 100644 index 000000000..c3639637a --- /dev/null +++ b/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake @@ -0,0 +1,6 @@ +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-targets.cmake)
\ No newline at end of file |