aboutsummaryrefslogtreecommitdiff
path: root/ports/protobuf/001-add-compiler-flag.patch
diff options
context:
space:
mode:
authorThierry Bastian <thierryb@filewave.com>2017-09-21 17:30:11 +0200
committerThierry Bastian <thierryb@filewave.com>2017-09-21 17:30:11 +0200
commitd40f2a4a5d51e28b322c5c63771af3e8de302c45 (patch)
treee43ab9346050911e383025899e75886187661ab5 /ports/protobuf/001-add-compiler-flag.patch
parentfdcb8a56a8affbff6b44ad97f7187b0229c634a3 (diff)
downloadvcpkg-d40f2a4a5d51e28b322c5c63771af3e8de302c45.tar.gz
vcpkg-d40f2a4a5d51e28b322c5c63771af3e8de302c45.zip
protobuf: update to 3.4.1
Diffstat (limited to 'ports/protobuf/001-add-compiler-flag.patch')
-rw-r--r--ports/protobuf/001-add-compiler-flag.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/ports/protobuf/001-add-compiler-flag.patch b/ports/protobuf/001-add-compiler-flag.patch
index dd1285cea..ad545cad3 100644
--- a/ports/protobuf/001-add-compiler-flag.patch
+++ b/ports/protobuf/001-add-compiler-flag.patch
@@ -17,22 +17,20 @@ index 7618ba2..d282a60 100644
include(tests.cmake)
diff --git a/cmake/install.cmake b/cmake/install.cmake
-index 441bf55..4158820 100644
+index 441bf55..20b3aa0 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -1,14 +1,17 @@
include(GNUInstallDirs)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf.pc.cmake
+set(LIBRARIES_TO_SET_DEST libprotobuf-lite libprotobuf)
+if(protobuf_BUILD_COMPILER)
+ list(APPEND LIBRARIES_TO_SET_DEST libprotoc)
+endif()
+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libprotobuf.cmake
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf.pc.cmake
${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc @ONLY)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf-lite.pc.cmake
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libprotobuf-lite.cmake
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf-lite.pc.cmake
${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc @ONLY)
foreach(_library