Fix version in CMakeLists.txt (#467)
* Fix version in CMakeLists.txt * Disable IXHttpClientTest
This commit is contained in:
parent
f79c64ae97
commit
397bb5d18a
@ -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
|
||||
|
@ -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@
|
||||
|
@ -16,7 +16,7 @@ set (TEST_TARGET_NAMES
|
||||
IXWebSocketServerTest
|
||||
IXWebSocketTestConnectionDisconnection
|
||||
IXUrlParserTest
|
||||
IXHttpClientTest
|
||||
# IXHttpClientTest ## FIXME httpbin.org does not seem normal
|
||||
IXUnityBuildsTest
|
||||
IXHttpTest
|
||||
IXDNSLookupTest
|
||||
|
Loading…
Reference in New Issue
Block a user