diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-06-18 02:18:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 11:18:54 -0700 |
| commit | f80c61927b5c976a39e7958cbc5c2bbd4d67a7a5 (patch) | |
| tree | e1e4c097a0554ce4cbf7d895d6bc59921d7c8ea7 /ports/slikenet/fix-install.patch | |
| parent | 6a8d2cb4a137b6aa54ec575aabcee9f6424054ff (diff) | |
| download | vcpkg-f80c61927b5c976a39e7958cbc5c2bbd4d67a7a5.tar.gz vcpkg-f80c61927b5c976a39e7958cbc5c2bbd4d67a7a5.zip | |
[slikenet] Add cmake config and targets file (#11987)
* [slikenet] Add cmake config and targets file
* Add vcpkg-cmake-wrapper
Diffstat (limited to 'ports/slikenet/fix-install.patch')
| -rw-r--r-- | ports/slikenet/fix-install.patch | 100 |
1 files changed, 51 insertions, 49 deletions
diff --git a/ports/slikenet/fix-install.patch b/ports/slikenet/fix-install.patch index 418b5e048..008dd1e7f 100644 --- a/ports/slikenet/fix-install.patch +++ b/ports/slikenet/fix-install.patch @@ -1,49 +1,51 @@ -diff --git a/Lib/DLL/CMakeLists.txt b/Lib/DLL/CMakeLists.txt -index 2d1e078..7e705cf 100644 ---- a/Lib/DLL/CMakeLists.txt -+++ b/Lib/DLL/CMakeLists.txt -@@ -50,13 +50,13 @@ ELSE(WIN32 AND NOT UNIX) - ENDIF(WIN32 AND NOT UNIX) - - target_link_libraries(SLikeNetDLL ${SLIKENET_LIBRARY_LIBS}) --IF(NOT WIN32 OR UNIX) -- configure_file(../../slikenet-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake @ONLY) -- -- install(TARGETS SLikeNetDLL EXPORT SLikeNetDLL DESTINATION lib/slikenet-${SLikeNet_VERSION}) -+IF(1) -+ install(TARGETS SLikeNetDLL -+ EXPORT SLikeNetDLL -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - INSTALL(FILES ${ALL_COMPATIBILITY_HEADER_SRC} DESTINATION include/slikenet-${SLikeNet_VERSION}) - INSTALL(FILES ${ALL_COMPATIBILITY_HEADER_SRC_2} DESTINATION include/slikenet-${SLikeNet_VERSION}/slikenet/slikenet) - INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION include/slikenet-${SLikeNet_VERSION}/slikenet/include/slikenet) -- INSTALL(FILES ../../slikenet-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) -- INSTALL(EXPORT SLikeNetDLL DESTINATION lib/slikenet-${SLikeNet_VERSION}) --ENDIF(NOT WIN32 OR UNIX) -+ENDIF(1) -diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt -index 955a99d..9211c45 100644 ---- a/Lib/LibStatic/CMakeLists.txt -+++ b/Lib/LibStatic/CMakeLists.txt -@@ -54,13 +54,14 @@ IF(WIN32 AND NOT UNIX) - IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles") - set_target_properties(SLikeNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" ) - ENDIF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles") --ELSE(WIN32 AND NOT UNIX) -- configure_file(../../slikenet-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake @ONLY) -+ENDIF(WIN32 AND NOT UNIX) - - INSTALL(TARGETS SLikeNetLibStatic EXPORT SLikeNetLibStatic DESTINATION lib/slikenet-${SLikeNet_VERSION}) -+ INSTALL(TARGETS SLikeNetLibStatic -+ EXPORT SLikeNetLibStatic -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION share/slikenet) - INSTALL(FILES ${ALL_COMPATIBILITY_HEADER_SRC} DESTINATION include/slikenet-${SLikeNet_VERSION}) - INSTALL(FILES ${ALL_COMPATIBILITY_HEADER_SRC_2} DESTINATION include/slikenet-${SLikeNet_VERSION}/slikenet) - INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION include/slikenet-${SLikeNet_VERSION}/include/slikenet) -- INSTALL(FILES ../../slikenet-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) -- INSTALL(EXPORT SLikeNetLibStatic FILE slikenet.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) --ENDIF(WIN32 AND NOT UNIX) +diff --git a/Lib/DLL/CMakeLists.txt b/Lib/DLL/CMakeLists.txt
+index 7f6453d..48f9562 100644
+--- a/Lib/DLL/CMakeLists.txt
++++ b/Lib/DLL/CMakeLists.txt
+@@ -50,6 +50,7 @@ ELSE(WIN32 AND NOT UNIX)
+ ENDIF(WIN32 AND NOT UNIX)
+
+ target_link_libraries(SLikeNetDLL ${SLIKENET_LIBRARY_LIBS})
++if(0)
+ IF(NOT WIN32 OR UNIX)
+ configure_file(../../slikenet-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake @ONLY)
+
+@@ -60,3 +61,12 @@ IF(NOT WIN32 OR UNIX)
+ INSTALL(FILES ../../slikenet-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION})
+ INSTALL(EXPORT SLikeNetDLL DESTINATION lib/slikenet-${SLikeNet_VERSION})
+ ENDIF(NOT WIN32 OR UNIX)
++endif()
++
++install(TARGETS SLikeNetDLL
++ EXPORT SLikeNetDLL
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib)
++INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION include/slikenet)
++install(EXPORT SLikeNetDLL FILE slikenetTargets.cmake DESTINATION share/slikenet)
+diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt
+index f936fa5..a5dcc4f 100644
+--- a/Lib/LibStatic/CMakeLists.txt
++++ b/Lib/LibStatic/CMakeLists.txt
+@@ -50,6 +50,8 @@ ELSE(WIN32 AND NOT UNIX)
+ ENDIF(WIN32 AND NOT UNIX)
+
+ target_link_libraries(SLikeNetLibStatic ${SLIKENET_LIBRARY_LIBS})
++
++if(0)
+ IF(WIN32 AND NOT UNIX)
+ IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles")
+ set_target_properties(SLikeNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" )
+@@ -64,3 +66,12 @@ ELSE(WIN32 AND NOT UNIX)
+ INSTALL(FILES ../../slikenet-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION})
+ INSTALL(EXPORT SLikeNetLibStatic FILE slikenet.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION})
+ ENDIF(WIN32 AND NOT UNIX)
++endif()
++
++INSTALL(TARGETS SLikeNetLibStatic
++ EXPORT SLikeNetLibStatic
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib)
++INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION include/slikenet)
++INSTALL(EXPORT SLikeNetLibStatic FILE slikenetTargets.cmake DESTINATION share/slikenet)
|