diff --git a/0_cmake_library/register/export.cmake b/0_cmake_library/register/export.cmake index 82148e6..601c817 100644 --- a/0_cmake_library/register/export.cmake +++ b/0_cmake_library/register/export.cmake @@ -11,3 +11,5 @@ if (DEFINED ENV{VULKAN_SDK} OR NOT "$ENV{VULKAN_SDK}" STREQUAL "") include("${CMAKE_CURRENT_LIST_DIR}/vsg_cesium.cmake") endif () +rcl_export_configuration(global) + diff --git a/0_cmake_library/register/libwebsockets.cmake b/0_cmake_library/register/libwebsockets.cmake index d33eabc..d7c53f7 100644 --- a/0_cmake_library/register/libwebsockets.cmake +++ b/0_cmake_library/register/libwebsockets.cmake @@ -33,13 +33,18 @@ block() -DLWS_WITH_LIBEVENT=OFF -DLWS_WITH_LIBEV=OFF ) - # Windows v5.0+: - # WebTransport / QUIC can use native SChannel. + # Windows v5.0+ WebTransport / QUIC can use native SChannel. if (WIN32) list(APPEND libwebsockets_opts -DLWS_WITH_SCHANNEL=ON + # The cl.bat compiler wrapper can report a failed include probe + # as successful. MSVC does not provide sys/types.h. + -DLWS_HAVE_SYS_TYPES_H=OFF + # Upstream C sources contain UTF-8 text and build with /WX. + -DCMAKE_C_FLAGS=-utf-8 ) endif () + set(cmake_library_output_message_log TRUE) _register_git_cmake_library(global::libwebsockets "https://github.com/warmcat/libwebsockets.git" "v5.0.0" @@ -68,4 +73,4 @@ block() global::libwebsockets "unset(libwebsockets_DIR)" ) -endblock() \ No newline at end of file +endblock()