50 lines
2.8 KiB
Diff
50 lines
2.8 KiB
Diff
--- libproxy-0.4.11/libproxy/cmake/pkgconfig.cmk.orig 2014-09-22 11:16:05.596800000 +0500
|
|
+++ libproxy-0.4.11/libproxy/cmake/pkgconfig.cmk 2014-09-22 11:16:12.336000000 +0500
|
|
@@ -1,4 +1,4 @@
|
|
-if(NOT WIN32 AND NOT APPLE)
|
|
+if(NOT WIN32 AND NOT APPLE OR MINGW)
|
|
find_package(PkgConfig)
|
|
|
|
# Define our magical px_check_modules function
|
|
--- libproxy-0.4.11/libproxy/cmake/devfiles.cmk.orig 2014-09-22 11:23:38.315800000 +0500
|
|
+++ libproxy-0.4.11/libproxy/cmake/devfiles.cmk 2014-09-22 11:23:45.991000000 +0500
|
|
@@ -1,4 +1,4 @@
|
|
-if(NOT WIN32)
|
|
+if(NOT WIN32 OR MINGW)
|
|
# PkgConfig file
|
|
set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
|
|
|
|
--- libproxy-0.4.11/cmake/paths.cmk.orig 2014-09-22 11:34:59.031600000 +0500
|
|
+++ libproxy-0.4.11/cmake/paths.cmk 2014-09-22 11:36:01.572000000 +0500
|
|
@@ -1,11 +1,11 @@
|
|
if(WIN32)
|
|
set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install prefix")
|
|
- set(BIN_INSTALL_DIR . CACHE PATH "Binary install dir")
|
|
- set(LIB_INSTALL_DIR . CACHE PATH "Library install dir")
|
|
- set(LIBEXEC_INSTALL_DIR . CACHE PATH "Private executable install dir")
|
|
+ set(BIN_INSTALL_DIR bin CACHE PATH "Binary install dir")
|
|
+ set(LIB_INSTALL_DIR lib CACHE PATH "Library install dir")
|
|
+ set(LIBEXEC_INSTALL_DIR libexec CACHE PATH "Private executable install dir")
|
|
set(INCLUDE_INSTALL_DIR include CACHE PATH "Include install dir")
|
|
- set(SYSCONF_INSTALL_DIR . CACHE PATH "Configuration install dir")
|
|
- set(SHARE_INSTALL_DIR . CACHE PATH "Data install dir")
|
|
+ set(SYSCONF_INSTALL_DIR etc CACHE PATH "Configuration install dir")
|
|
+ set(SHARE_INSTALL_DIR share CACHE PATH "Data install dir")
|
|
else(WIN32)
|
|
set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Install prefix")
|
|
set(BIN_INSTALL_DIR bin CACHE PATH "Binary install dir")
|
|
--- libproxy-0.4.11/libproxy/cmake/libproxy.cmk.orig 2014-09-22 11:42:17.021200000 +0500
|
|
+++ libproxy-0.4.11/libproxy/cmake/libproxy.cmk 2014-09-22 11:43:24.896800000 +0500
|
|
@@ -20,5 +20,10 @@
|
|
# 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(libproxy PROPERTIES OUTPUT_NAME proxy RUNTIME_OUTPUT_NAME libproxy-1 ARCHIVE_OUTPUT_NAME proxy)
|
|
+install(TARGETS libproxy
|
|
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
|
|
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
|
+ )
|
|
install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
|