From 2751530b1abde55ef6a296eb6257f0916e4f93a5 Mon Sep 17 00:00:00 2001 From: Lukas Herman Date: Fri, 12 Jun 2020 15:52:36 -0400 Subject: [PATCH] Fix a typo: LIBWEBSOCKET -> LIBWEBSOCKETS * Also update Producer C since it also contains the same typo --- CMake/Dependencies/libkvsCommonLws-CMakeLists.txt | 2 +- CMakeLists.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMake/Dependencies/libkvsCommonLws-CMakeLists.txt b/CMake/Dependencies/libkvsCommonLws-CMakeLists.txt index d692e15312..c6ed79bbdb 100644 --- a/CMake/Dependencies/libkvsCommonLws-CMakeLists.txt +++ b/CMake/Dependencies/libkvsCommonLws-CMakeLists.txt @@ -6,7 +6,7 @@ include(ExternalProject) ExternalProject_Add(libkvsCommonLws-download GIT_REPOSITORY https://github.com/awslabs/amazon-kinesis-video-streams-producer-c.git - GIT_TAG 270c0b6612cc553d458e316e835471c693f518bd + GIT_TAG bb5c4a7ff913fc0f557a5decaa35f45f802e10d9 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} -DBUILD_COMMON_LWS=ON -DBUILD_COMMON_CURL=OFF -DBUILD_DEPENDENCIES=FALSE -DOPEN_SRC_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} BUILD_ALWAYS TRUE diff --git a/CMakeLists.txt b/CMakeLists.txt index 26b1f9ba27..b6d80b1da7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,9 +93,9 @@ else() endif() if (WIN32) - SET(LIBWEBSOCKET_LIBRARIES "websockets.lib") + SET(LIBWEBSOCKETS_LIBRARIES "websockets.lib") else() - pkg_check_modules(LIBWEBSOCKET REQUIRED libwebsockets) + pkg_check_modules(LIBWEBSOCKETS REQUIRED libwebsockets) endif() # usrsctp dont support pkgconfig yet @@ -105,10 +105,10 @@ find_library( PATHS ${OPEN_SRC_INSTALL_PREFIX}/lib) set(OPEN_SRC_INCLUDE_DIRS ${LIBSRTP_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} - ${CURL_INCLUDE_DIRS} ${LIBWEBSOCKET_INCLUDE_DIRS}) + ${CURL_INCLUDE_DIRS} ${LIBWEBSOCKETS_INCLUDE_DIRS}) link_directories(${LIBSRTP_LIBRARY_DIRS}) -link_directories(${LIBWEBSOCKET_LIBRARY_DIRS}) +link_directories(${LIBWEBSOCKETS_LIBRARY_DIRS}) link_directories(${OPEN_SRC_INSTALL_PREFIX}/lib) pkg_check_modules(GST gstreamer-1.0) @@ -221,7 +221,7 @@ target_link_libraries( kvsWebrtcSignalingClient PRIVATE kvspicUtils kvspicState - ${LIBWEBSOCKET_LIBRARIES} + ${LIBWEBSOCKETS_LIBRARIES} ${EXTRA_DEPS} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}