30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
--- a/libproxy/cmake/pkgconfig.cmk
|
|
+++ b/libproxy/cmake/pkgconfig.cmk
|
|
@@ -1,4 +1,4 @@
|
|
-if(NOT WIN32 AND NOT APPLE)
|
|
+if(NOT MSVC AND NOT APPLE)
|
|
find_package(PkgConfig)
|
|
|
|
# Define our magical px_check_modules function
|
|
--- a/libproxy/cmake/libproxy.cmk
|
|
+++ b/libproxy/cmake/libproxy.cmk
|
|
@@ -18,11 +18,15 @@
|
|
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 PREFIX "" IMPORT_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)
|
|
+if(NOT APPLE AND NOT MINGW)
|
|
set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map")
|
|
endif()
|
|
-install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
|
|
+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})
|