forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[proxywrapper] Add new port (microsoft#8916)
* adding proxywrapper package * resolving review comments * restrict Linux only * [proxywrapper] Only static library * [libmodman] Move building of tests to a non-default feature * [libproxy] Move tests to a non-default feature * [libproxy] Add features for language bindings * [proxywrapper] Require C++ 11 standard
- Loading branch information
1 parent
227d055
commit e9267ac
Showing
9 changed files
with
117 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
Source: libmodman | ||
Version: 2.0.1 | ||
Version: 2.0.1-1 | ||
Homepage: https://code.google.com/p/libmodman | ||
Description: a simple library for managing modules | ||
Description: a simple library for managing modules | ||
|
||
Feature: tests | ||
Description: Build libmodman tests | ||
Build-Depends: zlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,26 @@ | ||
Source: libproxy | ||
Version: 0.4.15 | ||
Version: 0.4.15-1 | ||
Homepage: https://github.com/libproxy/libproxy | ||
Description: libproxy is a library that provides automatic proxy configuration management. | ||
Build-Depends: libmodman | ||
|
||
Feature: bindings-csharp | ||
Description: Install C# bindings | ||
|
||
Feature: bindings-python | ||
Description: Install Python bindings | ||
|
||
Feature: bindings-perl | ||
Description: Install PERL bindings | ||
|
||
Feature: bindings-ruby | ||
Description: Install Ruby bindings | ||
|
||
Feature: bindings-vala | ||
Description: Install Vala bindings | ||
|
||
Feature: tools | ||
Description: build tools | ||
Description: build tools | ||
|
||
Feature: tests | ||
Description: Build libproxy tests |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/libproxy/Findlibproxy.cmake.in b/libproxy/Findlibproxy.cmake.in | ||
index ef44489..c0bd2ae 100644 | ||
--- a/libproxy/Findlibproxy.cmake.in | ||
+++ b/libproxy/Findlibproxy.cmake.in | ||
@@ -12,7 +12,7 @@ | ||
|
||
# Find proxy.h and the corresponding library (libproxy.so) | ||
FIND_PATH(LIBPROXY_INCLUDE_DIR proxy.h ) | ||
-FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy ) | ||
+FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy libproxy) | ||
|
||
# Set library version | ||
SET(LIBPROXY_VERSION @PROJECT_VERSION@) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Source: proxywrapper | ||
Version: 1.0.0 | ||
Description: Provides a standalone wrapper around the libproxy library. | ||
Homepage: https://github.com/microsoft/proxy-wrapper | ||
Build-Depends: libproxy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 5a867a4..3ba85fa 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -5,11 +5,12 @@ project(proxywrapper) | ||
|
||
include(GNUInstallDirs) | ||
|
||
-find_library(proxy REQUIRED) | ||
+find_package(libproxy REQUIRED) | ||
|
||
-add_library(proxywrapper SHARED ProxyWrapper.cpp) | ||
+add_library(proxywrapper ProxyWrapper.cpp) | ||
|
||
-target_link_libraries(proxywrapper proxy) | ||
+target_link_libraries(proxywrapper PRIVATE ${LIBPROXY_LIBRARIES}) | ||
+target_include_directories(proxywrapper PRIVATE ${LIBPROXY_INCLUDE_DIR}) | ||
|
||
install(TARGETS proxywrapper EXPORT proxywrapper DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 3ba85fa..f18fd1e 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -1,7 +1,9 @@ | ||
|
||
cmake_minimum_required(VERSION 3.8) | ||
|
||
-project(proxywrapper) | ||
+project(proxywrapper C CXX) | ||
+ | ||
+set(CMAKE_CXX_STANDARD 11) | ||
|
||
include(GNUInstallDirs) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY) | ||
|
||
vcpkg_from_github( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO microsoft/proxy-wrapper | ||
REF b113aa0a284508ce0c2878febf9073d1f03b59dc | ||
SHA512 9793ec8b9cc0467c88d850ea51a96a0fdc3c3027cc5b7fd9f5d0362d7fd559e909f19a4eaca6554a9316d6e3a86bb5f541034ca9ce2fb8797fb2e5bdff42b0de | ||
HEAD_REF master | ||
PATCHES | ||
fix-find-libproxy.patch | ||
fix-macos-build.patch | ||
) | ||
|
||
vcpkg_configure_cmake( | ||
SOURCE_PATH ${SOURCE_PATH} | ||
PREFER_NINJA | ||
) | ||
|
||
vcpkg_install_cmake() | ||
|
||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) | ||
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) | ||
|