aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2019-09-27 09:48:09 -0700
committerCurtis J Bezault <curtbezault@gmail.com>2019-09-27 09:48:09 -0700
commit50b49af28a7ab619b341f3ba20d47592d302baab (patch)
tree0c6c42276a2ec65ee5183827af15fd143f7f7592
parentadfa6fd359e9d14e6697e25ada4fae5a3beebd85 (diff)
downloadvcpkg-50b49af28a7ab619b341f3ba20d47592d302baab.tar.gz
vcpkg-50b49af28a7ab619b341f3ba20d47592d302baab.zip
[cppkafka] Fix dynamic build. (#8073)
* [cppkafka] Fix dynamic build. * [cppkafka] Remove CPPKAFKA_BOOST_STATIC_LIBS * Remove CPPKAFKA_RDKAFKA_STATIC_LIB option
-rw-r--r--ports/cppkafka/CONTROL2
-rw-r--r--ports/cppkafka/fix-dynamic.patch12
-rw-r--r--ports/cppkafka/portfile.cmake10
3 files changed, 23 insertions, 1 deletions
diff --git a/ports/cppkafka/CONTROL b/ports/cppkafka/CONTROL
index f3a34e1fa..5fb06c47d 100644
--- a/ports/cppkafka/CONTROL
+++ b/ports/cppkafka/CONTROL
@@ -1,5 +1,5 @@
Source: cppkafka
-Version: 0.3.1
+Version: 0.3.1-1
Homepage: https://github.com/mfontanini/cppkafka
Description: cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.
Build-Depends: boost-program-options, librdkafka \ No newline at end of file
diff --git a/ports/cppkafka/fix-dynamic.patch b/ports/cppkafka/fix-dynamic.patch
new file mode 100644
index 000000000..e19188e27
--- /dev/null
+++ b/ports/cppkafka/fix-dynamic.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5d31078..b1d3634 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -43,6 +43,7 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include)
+
+ install(
+ TARGETS cppkafka
++ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ COMPONENT dev
diff --git a/ports/cppkafka/portfile.cmake b/ports/cppkafka/portfile.cmake
index 7b97e7f0d..fbb6e3bce 100644
--- a/ports/cppkafka/portfile.cmake
+++ b/ports/cppkafka/portfile.cmake
@@ -6,18 +6,28 @@ vcpkg_from_github(
REF v0.3.1
SHA512 60d01ce1dd9bd9119676be939ed5ab03539abb1f945c1b31e432edfe0f06542778f7fef37696f5ff19c53024f44d5cbd8aeddbbb231c38b098e05285d3ff0cab
HEAD_REF master
+ PATCHES fix-dynamic.patch
)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ set(CPPKAFKA_BUILD_SHARED OFF)
+else()
+ set(CPPKAFKA_BUILD_SHARED ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
+ -DCPPKAFKA_BUILD_SHARED=${CPPKAFKA_BUILD_SHARED}
-DCPPKAFKA_DISABLE_TESTS=ON
-DCPPKAFKA_DISABLE_EXAMPLES=ON
)
vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright