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.
[ffnvcodec/libproxy] Update to latest release version (microsoft#20169)
* [ffnvcodec/libproxy] Update to latest release version * Small changes * [ffnvcodec] Use version instead of version-string. Co-authored-by: Billy Robert O'Neal III <[email protected]>
- Loading branch information
1 parent
574c125
commit 69d5556
Showing
11 changed files
with
119 additions
and
127 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
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,15 +1,14 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 51b0e5e..aa94b87 100644 | ||
| index 1c68939..9ef6895 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -51,6 +51,10 @@ else() | ||
| endif() | ||
| @@ -42,6 +42,9 @@ else() | ||
| include_directories(${CMAKE_CURRENT_SOURCE_DIR}) | ||
| endif() | ||
|
|
||
| +if (WIN32) | ||
| + link_libraries(Advapi32) | ||
| +endif() | ||
| + | ||
| # Conditionally build bindings | ||
| if(NOT WIN32) | ||
| add_subdirectory(bindings) |
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,21 +1,52 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 451e7a6..b6782fb 100644 | ||
| index 4f51e38..32a0319 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -32,13 +32,15 @@ option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) | ||
| ### Subdirectories | ||
| # Conditionally build bundled libmodman | ||
| option(FORCE_SYSTEM_LIBMODMAN "Force using system libmodman" OFF) | ||
| -find_package(libmodman QUIET) | ||
| @@ -31,11 +31,15 @@ include(cmake/ctest.cmk) | ||
| include(cmake/paths.cmk) | ||
|
|
||
| option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) | ||
| - | ||
| -### Subdirectories | ||
| - | ||
| -add_subdirectory(libmodman) | ||
| -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) | ||
| +find_package(libmodman REQUIRED) | ||
| if(LIBMODMAN_FOUND) | ||
| if("${LIBMODMAN_VERSION_MAJOR}" STREQUAL "2") | ||
| message(STATUS "Building with system libmodman") | ||
| else() | ||
| message(FATAL_ERROR "Found incompatible libmodman on your system (libmodman 2.X is needed)") | ||
| endif() | ||
| +if(LIBMODMAN_FOUND) | ||
| + include_directories(${LIBMODMAN_INCLUDE_DIR}) | ||
| + link_libraries(${LIBMODMAN_LIBRARIES}) | ||
| +else() | ||
| + ### Subdirectories | ||
| + add_subdirectory(libmodman) | ||
| + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) | ||
| +endif() | ||
|
|
||
| # Conditionally build bindings | ||
| if(NOT WIN32) | ||
| diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk | ||
| index 9356486..f9eed2c 100644 | ||
| --- a/libproxy/cmake/libproxy.cmk | ||
| +++ b/libproxy/cmake/libproxy.cmk | ||
| @@ -1,8 +1,8 @@ | ||
| add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES}) | ||
| if(WIN32) | ||
| - target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES}) | ||
| + target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};ws2_32;${LIBPROXY_LIBRARIES}) | ||
| else() | ||
| if(FORCE_SYSTEM_LIBMODMAN) | ||
| message(FATAL_ERROR "Libmodman could not be found on your system") | ||
| - target_link_libraries(libproxy modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) | ||
| + target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) | ||
| endif() | ||
| file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR) | ||
| if(WIN32) | ||
| @@ -21,8 +21,8 @@ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp | ||
| set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) | ||
| set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") | ||
| set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") | ||
| -if(NOT APPLE) | ||
| - set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") | ||
| -endif() | ||
| +#if(NOT APPLE) | ||
| +# set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") | ||
| +#endif() | ||
| install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) | ||
| install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) |
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,13 +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@) | ||
| 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
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
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