mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 03:34:26 +08:00
506299a173
* [libproxy]Add new port. * [libmodman]Add new port. * [libproxy]Support windows, set dependency libmodman. * Add usage, add vcpkg-cmake-wrapper.cmake to libproxy. * add empty line to usage. * [libmodman]Fix undefined typeid in Visual Studio 2019. * [libproxy]Fix install libproxy.py error when it not exist. * Disable arm/uwp build. * Enable static build on UNIX. * [libproxy]Re-generate patches, delete default feature tools and use system libmodman. * [libproxy]Disable install libproxy.py. * [libproxy]Disable install Libproxy.pm and PLlibproxy. * [libproxy]DISABLE PARALLEL CONFIGURE * [libproxy]Revert 6f233cced1a51a086e5fea5bf290565d9847d4b7 * [libmodman/libproxy]Fix arm build.
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
diff --git a/libmodman/CMakeLists.txt b/libmodman/CMakeLists.txt
|
|
index 0aff593..9e419ce 100644
|
|
--- a/libmodman/CMakeLists.txt
|
|
+++ b/libmodman/CMakeLists.txt
|
|
@@ -30,15 +30,15 @@ if(NOT WIN32 AND NOT APPLE)
|
|
configure_file(libmodman-2.0.pc.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/libmodman-2.0.pc @ONLY)
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmodman-2.0.pc
|
|
- DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
|
|
+ DESTINATION lib/pkgconfig)
|
|
endif()
|
|
|
|
# CMake Find helper
|
|
-if (NOT WIN32 AND NOT APPLE)
|
|
+if (1)
|
|
configure_file(Findlibmodman.cmake.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/Findlibmodman.cmake @ONLY)
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Findlibmodman.cmake
|
|
- DESTINATION ${SHARE_INSTALL_DIR}/cmake/Modules)
|
|
+ DESTINATION share/${PROJECT_NAME})
|
|
endif()
|
|
|
|
# Define the library itself
|
|
@@ -50,8 +50,13 @@ if(NOT WIN32)
|
|
target_link_libraries(modman dl)
|
|
endif()
|
|
set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1.0.0 SOVERSION 1)
|
|
-install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR})
|
|
-install(FILES module_manager.hpp module.hpp DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME})
|
|
+install(
|
|
+ TARGETS modman
|
|
+ RUNTIME DESTINATION bin
|
|
+ LIBRARY DESTINATION lib
|
|
+ ARCHIVE DESTINATION lib
|
|
+)
|
|
+install(FILES module_manager.hpp module.hpp DESTINATION include/${PROJECT_NAME})
|
|
|
|
### Tests
|
|
add_testdirectory(test)
|