aboutsummaryrefslogtreecommitdiff
path: root/ports/socket-io-client
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-02-28 23:53:42 -0800
committerGitHub <noreply@github.com>2019-02-28 23:53:42 -0800
commit8641dfd9dd6d3bf190515822060872a56ee37906 (patch)
tree1334dd5e7c0b2b5eb89452010b730cfbcf25ff85 /ports/socket-io-client
parent1afa2b0f7ba4079ff1bb1dd7724733b0cfc583d2 (diff)
downloadvcpkg-8641dfd9dd6d3bf190515822060872a56ee37906.tar.gz
vcpkg-8641dfd9dd6d3bf190515822060872a56ee37906.zip
Modify `vcpkg_fixup_cmake_targets()` (#5459)
* some libraries export <PackageName>LibraryDepends.cmake instead of <PackageName>Targets.cmake. Those file also need the fix of #1044 should close #4753 * prefered the general solution #4622. hopefully solved the issue within #4150 replaced the regex with something more readable (also ident is lost) should close: #4753 #4633 #4150 and maybe more * Hash vcpkg_fixup_cmake_targets.cmake * [boost] Fix use of find_package(Boost) with cache variables [socket-io-client] Fix install * reversed change back to use regex replace * [glbinding] Fix _IMPORT_PREFIX depth in *-export.cmake files * [tinyspline] Ignore warnings treated as errors * [libevent, liblemon, libpng, smpeg2, zlib] Fix apply patches * [libsodium] Fix apply patches * [folly] Link correct libraries in debug and release * [vtk] Remove unset of _IMPORT_PREFIX * [tinyspline] Do not treat warnings as errors * [smpeg2] Fix double* to int comparison * [nvtt] Define value for HAVE_UNISTD_H in MacOS * [libui] Fix MacOS X build * [zlib] Fix download URL * [qhull] Update to v7.2.1 * [podofo] Set value for HAVE_UNISTD_H in MacOS * [mongo-cxx-driver,ogre,podofo,qhull] Bump CONTROL version * [mongo-c-driver] Set _IMPORT_PREFIX * [tmxparser] Bump CONTROL version * [qhull,vxl] Bump CONTROL version
Diffstat (limited to 'ports/socket-io-client')
-rw-r--r--ports/socket-io-client/CONTROL2
-rw-r--r--ports/socket-io-client/fix-install.patch22
-rw-r--r--ports/socket-io-client/portfile.cmake13
3 files changed, 28 insertions, 9 deletions
diff --git a/ports/socket-io-client/CONTROL b/ports/socket-io-client/CONTROL
index 92a5f20c8..bd7b036a8 100644
--- a/ports/socket-io-client/CONTROL
+++ b/ports/socket-io-client/CONTROL
@@ -1,4 +1,4 @@
Source: socket-io-client
-Version: 1.6.1
+Version: 1.6.1-1
Description: C++11 implementation of Socket.IO client
Build-Depends: boost, rapidjson, websocketpp
diff --git a/ports/socket-io-client/fix-install.patch b/ports/socket-io-client/fix-install.patch
new file mode 100644
index 000000000..2c9cc0e82
--- /dev/null
+++ b/ports/socket-io-client/fix-install.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8c2fad3..3f322b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,13 +72,11 @@ list(APPEND TARGET_LIBRARIES sioclient_tls)
+ endif()
+
+ install(FILES ${ALL_HEADERS}
+- DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/include"
++ DESTINATION include
+ )
+
+ install(TARGETS ${TARGET_LIBRARIES}
+- DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}"
+-)
+-
+-install(FILES ${Boost_LIBRARIES}
+- DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}"
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib
+ )
diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake
index eed7a4d65..c7d33d23d 100644
--- a/ports/socket-io-client/portfile.cmake
+++ b/ports/socket-io-client/portfile.cmake
@@ -1,27 +1,24 @@
include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO socketio/socket.io-client-cpp
REF 1.6.1
SHA512 01c9c172e58a16b25af07c6bde593507792726aca28a9b202ed9531d51cd7e77c7e7d536102e50265d66de96e9708616075902dfdcfc72983758755381bad707
HEAD_REF master
+ PATCHES fix-install.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA # Disable this option if project cannot be built with Ninja
- # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
- # OPTIONS_RELEASE -DOPTIMIZE=1
- # OPTIONS_DEBUG -DDEBUGGABLE=1
+ PREFER_NINJA
)
vcpkg_install_cmake()
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/build/include
- DESTINATION ${CURRENT_PACKAGES_DIR}/include
- FILES_MATCHING PATTERN "*.h")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/socket-io-client/copyright COPYONLY)