From 397bb5d18a6fa5c37cf999339959efa1f58080c3 Mon Sep 17 00:00:00 2001 From: lanthora Date: Tue, 6 Jun 2023 01:03:17 +0800 Subject: [PATCH] Fix version in CMakeLists.txt (#467) * Fix version in CMakeLists.txt * Disable IXHttpClientTest --- CMakeLists.txt | 7 +++---- ixwebsocket.pc.in | 2 +- test/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 791ae572..0242eb6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.4.1...3.17.2) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}") -project(ixwebsocket C CXX) +project(ixwebsocket LANGUAGES C CXX VERSION 11.4.3) set (CMAKE_CXX_STANDARD 11) set (CXX_STANDARD_REQUIRED ON) @@ -166,10 +166,9 @@ if(BUILD_SHARED_LIBS) ${IXWEBSOCKET_SOURCES} ${IXWEBSOCKET_HEADERS} ) - + # Set library version - set(version 11.3.2) - set_target_properties(ixwebsocket PROPERTIES VERSION ${version}) + set_target_properties(ixwebsocket PROPERTIES VERSION ${CMAKE_PROJECT_VERSION}) else() # Static library diff --git a/ixwebsocket.pc.in b/ixwebsocket.pc.in index d1c2813e..fb72ec85 100644 --- a/ixwebsocket.pc.in +++ b/ixwebsocket.pc.in @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: ixwebsocket Description: websocket and http client and server library, with TLS support and very few dependencies -Version: @version@ +Version: @CMAKE_PROJECT_VERSION@ Libs: -L${libdir} -lixwebsocket Cflags: -I${includedir} Requires: @requires@ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 36e2204f..c2fa943d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -16,7 +16,7 @@ set (TEST_TARGET_NAMES IXWebSocketServerTest IXWebSocketTestConnectionDisconnection IXUrlParserTest - IXHttpClientTest + # IXHttpClientTest ## FIXME httpbin.org does not seem normal IXUnityBuildsTest IXHttpTest IXDNSLookupTest