Skip to content

Commit

Permalink
Fix QNS builds (microsoft#1891)
Browse files Browse the repository at this point in the history
ALIAS targets only work in 3.18. Instead of bumping the requirement, remove the ALIAS target from OpenSSL
  • Loading branch information
thhous-msft authored Aug 9, 2021
1 parent 41736a5 commit 8569b6c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,6 @@ set(QUIC_LIBRARY_NAME "msquic" CACHE STRING "Override the output library name")

set(BUILD_SHARED_LIBS ${QUIC_BUILD_SHARED})

# FindLTTngUST does not exist before CMake 3.6, so disable logging for older cmake versions
if (${CMAKE_VERSION} VERSION_LESS "3.6.0")
message(WARNING "Logging unsupported on this version of CMake. Please upgrade to 3.6 or later.")
set(QUIC_ENABLE_LOGGING OFF)
endif()

if (QUIC_PDBALTPATH AND MSVC)
# Disabled in all cases because generation is broken.
# file(READ ${CMAKE_CURRENT_LIST_DIR}/cmake/PdbAltPath.txt PDBALTPATH)
Expand Down Expand Up @@ -485,7 +479,7 @@ if(QUIC_TLS STREQUAL "openssl")

target_link_libraries(OpenSSL
INTERFACE
OpenSSLQuic::OpenSSLQuic
OpenSSLQuic
)
endif()

Expand Down
4 changes: 0 additions & 4 deletions submodules/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ if (WIN32)
$<$<NOT:$<CONFIG:Debug>>:${LIBCRYPTO_PATH}>
)

add_library(OpenSSLQuic::OpenSSLQuic ALIAS OpenSSLQuic)

else()

set(LIBSSL_PATH ${OPENSSL_DIR}/lib/libssl${CMAKE_STATIC_LIBRARY_SUFFIX})
Expand Down Expand Up @@ -267,6 +265,4 @@ else()
)
endif()

add_library(OpenSSLQuic::OpenSSLQuic ALIAS OpenSSLQuic)

endif()

0 comments on commit 8569b6c

Please sign in to comment.