diff options
Diffstat (limited to 'vcpkg/ports/clockutils')
| -rw-r--r-- | vcpkg/ports/clockutils/add-missing-thread-header.patch | 24 | ||||
| -rw-r--r-- | vcpkg/ports/clockutils/cmake4.patch | 22 | ||||
| -rw-r--r-- | vcpkg/ports/clockutils/disable-werror.diff | 22 | ||||
| -rw-r--r-- | vcpkg/ports/clockutils/fix-warningC4643.patch | 29 | ||||
| -rw-r--r-- | vcpkg/ports/clockutils/portfile.cmake | 41 | ||||
| -rw-r--r-- | vcpkg/ports/clockutils/vcpkg.json | 14 |
6 files changed, 152 insertions, 0 deletions
diff --git a/vcpkg/ports/clockutils/add-missing-thread-header.patch b/vcpkg/ports/clockutils/add-missing-thread-header.patch new file mode 100644 index 0000000..995a097 --- /dev/null +++ b/vcpkg/ports/clockutils/add-missing-thread-header.patch @@ -0,0 +1,24 @@ +diff --git a/include/clockUtils/sockets/TcpSocket.h b/include/clockUtils/sockets/TcpSocket.h +index 3bb97a9..cdd7810 100644 +--- a/include/clockUtils/sockets/TcpSocket.h ++++ b/include/clockUtils/sockets/TcpSocket.h +@@ -33,6 +33,7 @@ + #include <sstream> + #include <string> + #include <vector> ++#include <thread> + + #include "clockUtils/errors.h" + +diff --git a/include/clockUtils/sockets/UdpSocket.h b/include/clockUtils/sockets/UdpSocket.h +index c5da451..ea0a518 100644 +--- a/include/clockUtils/sockets/UdpSocket.h ++++ b/include/clockUtils/sockets/UdpSocket.h +@@ -33,6 +33,7 @@ + #include <queue> + #include <string> + #include <vector> ++#include <thread> + + #include "clockUtils/errors.h" + diff --git a/vcpkg/ports/clockutils/cmake4.patch b/vcpkg/ports/clockutils/cmake4.patch new file mode 100644 index 0000000..1c95cdc --- /dev/null +++ b/vcpkg/ports/clockutils/cmake4.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 89b42c8398..5c77383813 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,7 +61,7 @@ IF(WITH_TESTING AND UNIX) + ENDIF(WITH_TESTING AND UNIX) + set (CLANG_FLAGS "-Wstring-plus-int") + +-IF(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) ++IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang) + set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} ${CLANG_FLAGS} -g") + set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} ${CLANG_FLAGS} -0s -DNDEBUG") + set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG -Werror") +@@ -141,7 +141,7 @@ ELSEIF(WIN32) + ENDIF() + SET(COMPILER_VERSION ${DEP_DIR_BUILD}) + ELSEIF(UNIX) +- IF(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) ++ IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang) + SET(DEP_DIR_BUILD "clang") + SET(UNIX_COMPILER "clang") + ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) diff --git a/vcpkg/ports/clockutils/disable-werror.diff b/vcpkg/ports/clockutils/disable-werror.diff new file mode 100644 index 0000000..12c48c6 --- /dev/null +++ b/vcpkg/ports/clockutils/disable-werror.diff @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c77383..0c8029b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,13 +64,13 @@ set (CLANG_FLAGS "-Wstring-plus-int") + IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang) + set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} ${CLANG_FLAGS} -g") + set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} ${CLANG_FLAGS} -0s -DNDEBUG") +- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG -Werror") +- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g -Werror") ++ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG") ++ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g") + ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) + set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} -g") + set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} -0s -DNDEBUG") +- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG -Werror") +- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g -Werror") ++ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG") ++ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g") + ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) + set (CXX_FLAGS "/MP /W4 /wd4127 /D_WINSOCK_DEPRECATED_NO_WARNINGS /DNOMINMAX") + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CXX_FLAGS}") diff --git a/vcpkg/ports/clockutils/fix-warningC4643.patch b/vcpkg/ports/clockutils/fix-warningC4643.patch new file mode 100644 index 0000000..49bc323 --- /dev/null +++ b/vcpkg/ports/clockutils/fix-warningC4643.patch @@ -0,0 +1,29 @@ +diff --git a/include/clockUtils/sockets/TcpSocket.h b/include/clockUtils/sockets/TcpSocket.h
+index 6e0d9c8..3bb97a9 100644
+--- a/include/clockUtils/sockets/TcpSocket.h
++++ b/include/clockUtils/sockets/TcpSocket.h
+@@ -57,9 +57,6 @@
+ #define INVALID_SOCKET -1
+ #endif
+
+-namespace std {
+- class thread;
+-} /* namespace std */
+ namespace clockUtils {
+ enum class ClockError;
+ namespace sockets {
+diff --git a/include/clockUtils/sockets/UdpSocket.h b/include/clockUtils/sockets/UdpSocket.h
+index 31eeeb5..c5da451 100644
+--- a/include/clockUtils/sockets/UdpSocket.h
++++ b/include/clockUtils/sockets/UdpSocket.h
+@@ -60,10 +60,6 @@
+ #define INVALID_SOCKET -1
+ #endif
+
+-namespace std {
+- class thread;
+-} /* namespace std */
+-
+ namespace clockUtils {
+ enum class ClockError;
+ namespace sockets {
diff --git a/vcpkg/ports/clockutils/portfile.cmake b/vcpkg/ports/clockutils/portfile.cmake new file mode 100644 index 0000000..b6b791d --- /dev/null +++ b/vcpkg/ports/clockutils/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ClockworkOrigins/clockUtils + REF 3651f232c27074c4ceead169e223edf5f00247c5 + SHA512 ddb70cae9ced25de77a2df1854dac15e58a77347042ba3ee9c691f85f49edbc6539c84929a7477d429fb9161ba24c57d24d767793b8b1180216d5ddfc5d3ed6a + HEAD_REF dev-1.2 + PATCHES + fix-warningC4643.patch + add-missing-thread-header.patch + cmake4.patch + disable-werror.diff +) + +set(SHARED_FLAG OFF) +set(USE_MSBUILD "") +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") + set(SHARED_FLAG ON) + set(USE_MSBUILD WINDOWS_USE_MSBUILD) # MS Build only required for dynamic builds +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${USE_MSBUILD} + OPTIONS + -DWITH_LIBRARY_ARGPARSER=ON + -DWITH_LIBRARY_COMPRESSION=ON + -DWITH_LIBRARY_CONTAINER=ON + -DWITH_LIBRARY_INIPARSER=ON + -DWITH_LIBRARY_SOCKETS=ON + -DWITH_TESTING=OFF + -DCLOCKUTILS_BUILD_SHARED=${SHARED_FLAG} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/vcpkg/ports/clockutils/vcpkg.json b/vcpkg/ports/clockutils/vcpkg.json new file mode 100644 index 0000000..d2f43d5 --- /dev/null +++ b/vcpkg/ports/clockutils/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "clockutils", + "version": "1.1.1", + "port-version": 4, + "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", + "homepage": "https://github.com/ClockworkOrigins/clockUtils", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} |