d449cdab9c
processing. While there, remove unnecessary patches (some fixed upstream, some workarounds for header problems which have since been cleaned up, and change the "Build the pacrunner into libproxy" patch into -DBIPR:BOOL=OFF in CONFIGURE_ARGS instead). ok ajacoutot@
27 lines
1.6 KiB
Plaintext
27 lines
1.6 KiB
Plaintext
$OpenBSD: patch-libproxy_cmake_libproxy_cmk,v 1.6 2012/10/12 13:01:15 sthen Exp $
|
|
--- libproxy/cmake/libproxy.cmk.orig Fri Oct 12 13:40:53 2012
|
|
+++ libproxy/cmake/libproxy.cmk Fri Oct 12 13:41:18 2012
|
|
@@ -1,8 +1,8 @@
|
|
-add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES})
|
|
+add_library(proxy 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(proxy modman;ws2_32;${LIBPROXY_LIBRARIES})
|
|
else()
|
|
- target_link_libraries(libproxy modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES})
|
|
+ target_link_libraries(proxy modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES})
|
|
endif()
|
|
file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
|
|
if(WIN32)
|
|
@@ -18,7 +18,7 @@ endif()
|
|
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
|
|
PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
|
|
# When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings.
|
|
-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
|
|
-set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
|
-install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
|
|
+set_target_properties(proxy PROPERTIES VERSION 1.0.0 SOVERSION 1)
|
|
+set_target_properties(proxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
|
+install(TARGETS proxy DESTINATION ${LIB_INSTALL_DIR})
|
|
install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
|