path: root/cmake_args.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f77c297..ceb8bc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,9 +97,9 @@ else()
     #set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/msquic/lib")
     endif("${isSystemDir}" STREQUAL "-1")
 
-    set(msquic_dest msquic)
-    set(main_lib_dest msquic/lib)
-    set(include_dest msquic/include)
+    set(msquic_dest ${CMAKE_INSTALL_PREFIX})
+    set(main_lib_dest lib)
+    set(include_dest include)
 endif()
 
 set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)")
@@ -451,7 +451,7 @@ else() #!WIN32
     set(CMAKE_C_FLAGS_DEBUG "-Og")
     set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${MARCH} -DNDEBUG")
-    set(CMAKE_C_FLAGS_RELEASE "-O3 ${MARCH} -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG")
     if (CX_PLATFORM STREQUAL "darwin")
         set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -gdwarf")
         set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -gdwarf")
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 1576577..6865bab 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -2,280 +2,295 @@
 # Licensed under the MIT License.
 
 if(WIN32)
-    configure_file(winuser/msquic.rc.in ${CMAKE_CURRENT_BINARY_DIR}/msquic.rc )
-    configure_file(winuser/msquic.def.in ${CMAKE_CURRENT_BINARY_DIR}/msquic.def )
-    set(SOURCES winuser/dllmain.c ${CMAKE_CURRENT_BINARY_DIR}/msquic.rc $<TARGET_OBJECTS:MsQuicEtw_Resource>)
+  configure_file(winuser/msquic.rc.in ${CMAKE_CURRENT_BINARY_DIR}/msquic.rc)
+  configure_file(winuser/msquic.def.in ${CMAKE_CURRENT_BINARY_DIR}/msquic.def)
+  set(SOURCES winuser/dllmain.c ${CMAKE_CURRENT_BINARY_DIR}/msquic.rc $<TARGET_OBJECTS:MsQuicEtw_Resource>)
 else()
-    set(SOURCES linux/init.c)
+  set(SOURCES linux/init.c)
 endif()
 
 if(BUILD_SHARED_LIBS)
-    add_library(msquic SHARED ${SOURCES})
-    target_link_libraries(msquic PRIVATE core platform inc warnings logging)
-    set_target_properties(msquic PROPERTIES OUTPUT_NAME ${QUIC_LIBRARY_NAME})
+  add_library(msquic SHARED ${SOURCES})
+  target_link_libraries(msquic PRIVATE core platform inc warnings logging)
+  set_target_properties(msquic PROPERTIES OUTPUT_NAME ${QUIC_LIBRARY_NAME})
 else()
-    add_library(msquic_static STATIC static/empty.c)
-    target_link_libraries(msquic_static PRIVATE core platform inc logging)
-    target_compile_definitions(msquic_static PUBLIC QUIC_BUILD_STATIC)
-    set_property(TARGET msquic_static PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
-
-    # We need to take given library and walk all its dependencies, including
-    # transient dependencies. For each dependency, if it either compiles
-    # directly to or imports a static library, that library needs to be
-    # added to the QUIC_STATIC_LIBS list. This list is ultimately fed into
-    # the archiving utility to produce a monolithic static library as
-    # static library flags.
-    #
-    # Here, we exclude the inc interface target which includes various system
-    # libraries we do not wish to archive for distribution.
-    set(EXCLUDE_LIST "inc")
-    if (CX_PLATFORM STREQUAL "darwin")
-        list(APPEND EXCLUDE_LIST "-framework CoreFoundation" "-framework Security")
+  add_library(msquic_static STATIC static/empty.c)
+  target_link_libraries(msquic_static PRIVATE core platform inc logging)
+  target_compile_definitions(msquic_static PUBLIC QUIC_BUILD_STATIC)
+  set_property(TARGET msquic_static PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
+
+  # We need to take given library and walk all its dependencies, including
+  # transient dependencies. For each dependency, if it either compiles
+  # directly to or imports a static library, that library needs to be
+  # added to the QUIC_STATIC_LIBS list. This list is ultimately fed into
+  # the archiving utility to produce a monolithic static library as
+  # static library flags.
+  #
+  # Here, we exclude the inc interface target which includes various system
+  # libraries we do not wish to archive for distribution.
+  set(EXCLUDE_LIST "inc")
+  if(CX_PLATFORM STREQUAL "darwin")
+    list(APPEND EXCLUDE_LIST "-framework CoreFoundation" "-framework Security")
+  endif()
+  set_property(GLOBAL PROPERTY VISITED_TARGETS_PROP "${EXCLUDE_LIST}")
+  set_property(GLOBAL PROPERTY QUIC_STATIC_LIBS "")
+  function(flatten_link_dependencies CURRENT_TARGET)
+    # Check first if we've already flattened the dependencies of this
+    # library (possible if the dependency exists multiple times in the
+    # same dependency graph)
+    get_property(VISITED_TARGETS GLOBAL PROPERTY VISITED_TARGETS_PROP)
+
+    if(${CURRENT_TARGET} IN_LIST VISITED_TARGETS)
+      return()
     endif()
-    set_property(GLOBAL PROPERTY VISITED_TARGETS_PROP "${EXCLUDE_LIST}")
-    set_property(GLOBAL PROPERTY QUIC_STATIC_LIBS "")
-    function(flatten_link_dependencies CURRENT_TARGET)
-        # Check first if we've already flattened the dependencies of this
-        # library (possible if the dependency exists multiple times in the
-        # same dependency graph)
-        get_property(VISITED_TARGETS GLOBAL PROPERTY VISITED_TARGETS_PROP)
-
-        if(${CURRENT_TARGET} IN_LIST VISITED_TARGETS)
-            return()
-        endif()
-
-        # Ensure we don't process this target again
-        list(APPEND VISITED_TARGETS ${CURRENT_TARGET})
-        set_property(GLOBAL PROPERTY VISITED_TARGETS_PROP ${VISITED_TARGETS})
-
-        # Uncomment to understand the dependency walk
-        # message(STATUS "Evaluating linker output and dependencies for ${CURRENT_TARGET}")
-
-        if(NOT TARGET ${CURRENT_TARGET})
-            string(FIND ${CURRENT_TARGET} "$<LINK_ONLY:" LINK_ONLY)
-            string(FIND ${CURRENT_TARGET} "Threads::Threads" THREADS_TARGET)
-            string(FIND ${CURRENT_TARGET} "${CMAKE_STATIC_LIBRARY_SUFFIX}" SUFFIX_INDEX)
-            if(${SUFFIX_INDEX} EQUAL "-1")
-                string(APPEND CURRENT_TARGET "${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            endif()
-
-            if(${LINK_ONLY} EQUAL "-1" AND ${THREADS_TARGET} EQUAL "-1")
-                # This is expected to be a generator expression that maps
-                # to a static library
-                set_property(
-                    GLOBAL
-                    APPEND
-                    PROPERTY QUIC_STATIC_LIBS
-                    \"${CURRENT_TARGET}\"
-                )
-            endif()
-            return()
-        endif()
-
-        # Check if this is an interface target
-        get_target_property(TARGET_TYPE ${CURRENT_TARGET} TYPE)
-
-        get_target_property(TARGET_OUTPUT ${CURRENT_TARGET} OUTPUT_NAME)
-        if(NOT TARGET_OUTPUT)
-            # The target's logical name is used as the base name if the
-            # output name property isn't specified
-            set(TARGET_OUTPUT ${CURRENT_TARGET})
-        endif()
-
-        if(${TARGET_TYPE} STREQUAL "STATIC_LIBRARY")
-            get_target_property(OUTPUT_DIR ${CURRENT_TARGET} ARCHIVE_OUTPUT_DIRECTORY)
-            if(OUTPUT_DIR)
-                set(STATIC_LIB "${OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${TARGET_OUTPUT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-                set_property(
-                    GLOBAL
-                    APPEND
-                    PROPERTY QUIC_STATIC_LIBS
-                    \"${STATIC_LIB}\"
-                )
-            endif()
-        endif()
-
-        # Next, recursively invoke this function for each dependency
-
-        get_target_property(LINK_LIBS ${CURRENT_TARGET} LINK_LIBRARIES)
-        get_target_property(INTERFACE_LIBS ${CURRENT_TARGET} INTERFACE_LINK_LIBRARIES)
-        get_target_property(DEPS ${CURRENT_TARGET} LINK_DEPENDS)
-
-        if(LINK_LIBS)
-            foreach(DEP ${LINK_LIBS})
-                flatten_link_dependencies(${DEP})
-            endforeach()
-        endif()
-
-        if(INTERFACE_LIBS)
-            foreach(DEP ${INTERFACE_LIBS})
-                flatten_link_dependencies(${DEP})
-            endforeach()
-        endif()
-    endfunction()
-
-    flatten_link_dependencies(msquic_static)
-
-    get_property(DEPS_LIST GLOBAL PROPERTY QUIC_STATIC_LIBS)
-    set(DEPS_STRING "")
-    foreach(line ${DEPS_LIST})
-        set(DEPS_STRING "${DEPS_STRING}${line} ")
-    endforeach(line)
-
-    # Uncomment to analyze which dependencies were traversed
-    # message(STATUS "DEPS: ${DEPS_LIST}, ${QUIC_BUILD_DIR}")
 
-    if(APPLE)
-        # Emit all linker inputs at build time to resolve generator expressions
-        set(QUIC_DEPS_FILE ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>/quicdeps.txt)
-        file(
-            GENERATE
-            OUTPUT ${QUIC_DEPS_FILE}
-            CONTENT "${DEPS_STRING}"
-        )
-        add_custom_target(
-            msquic_linker_inputs
-            DEPENDS ${QUIC_DEPS_FILE}
-        )
-        add_dependencies(msquic_linker_inputs msquic_static)
-        set_property(TARGET msquic_linker_inputs PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
-
-        # Run archiver tool
-        add_custom_target(
-            msquic_lib
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            COMMAND libtool -static -o \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmsquic.a\" @${QUIC_DEPS_FILE}
-            DEPENDS ${QUIC_DEPS_FILE}
-        )
-    elseif(WIN32)
-        set(NODEFAULTS "")
-        foreach(EXCLUDE ${EXCLUDE_LIST})
-            string(APPEND NODEFAULTS "/NODEFAULTLIB:${EXCLUDE}${CMAKE_STATIC_LIBRARY_SUFFIX} ")
-        endforeach()
-
-        # Exclude libraries for the corresponding msvcrts
-        # https://docs.microsoft.com/en-us/cpp/error-messages/tool-errors/linker-tools-warning-lnk4098?view=msvc-160
-        string(APPEND NODEFAULTS "/NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcrtd.lib $<IF:$<CONFIG:Debug>,/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:msvcrtd.lib,/NODEFAULTLIB:libcmtd.lib>")
-        # Uncomment to inspect which libraries will have referenced symbols ignored
-        # message(STATUS "NODEFAULTS: ${NODEFAULTS}")
-
-        # Emit all linker inputs at build time to resolve generator expressions
-        set(QUIC_DEPS_FILE ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>/quicdeps.txt)
-        file(
-            GENERATE
-            OUTPUT ${QUIC_DEPS_FILE}
-            CONTENT "/OUT:\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/msquic.lib\" ${DEPS_STRING} ${NODEFAULTS}"
-        )
-        add_custom_target(
-            msquic_linker_inputs
-            DEPENDS ${QUIC_DEPS_FILE}
-        )
-        add_dependencies(msquic_linker_inputs msquic_static)
-        set_property(TARGET msquic_linker_inputs PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
-
-        # Run archiver tool (lib.exe) on our generated linker args
-        add_custom_target(
-            msquic_lib
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            COMMAND ${CMAKE_AR} @${QUIC_DEPS_FILE}
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/msquic.lib" "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}"
-            DEPENDS ${QUIC_DEPS_FILE}
-        )
-    else()
-        # Emit all linker inputs at build time to resolve generator expressions
-        set(QUIC_DEPS_FILE ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>/quicdeps.txt)
-        set(DEPS_LINES "")
-        foreach(line ${DEPS_LIST})
-            message(STATUS ${line})
-            set(DEPS_LINES "${DEPS_LINES}addlib ${line}\n")
-        endforeach(line)
-        file(
-            GENERATE
-            OUTPUT ${QUIC_DEPS_FILE}
-            CONTENT "create \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmsquic.a\"\n${DEPS_LINES}save\nend\n"
+    # Ensure we don't process this target again
+    list(APPEND VISITED_TARGETS ${CURRENT_TARGET})
+    set_property(GLOBAL PROPERTY VISITED_TARGETS_PROP ${VISITED_TARGETS})
+
+    # Uncomment to understand the dependency walk
+    # message(STATUS "Evaluating linker output and dependencies for ${CURRENT_TARGET}")
+
+    if(NOT TARGET ${CURRENT_TARGET})
+      string(FIND ${CURRENT_TARGET} "$<LINK_ONLY:" LINK_ONLY)
+      string(FIND ${CURRENT_TARGET} "Threads::Threads" THREADS_TARGET)
+      string(FIND ${CURRENT_TARGET} "${CMAKE_STATIC_LIBRARY_SUFFIX}" SUFFIX_INDEX)
+      if(${SUFFIX_INDEX} EQUAL "-1")
+        string(APPEND CURRENT_TARGET "${CMAKE_STATIC_LIBRARY_SUFFIX}")
+      endif()
+
+      if(${LINK_ONLY} EQUAL "-1" AND ${THREADS_TARGET} EQUAL "-1")
+        # This is expected to be a generator expression that maps
+        # to a static library
+        set_property(
+          GLOBAL
+          APPEND
+          PROPERTY QUIC_STATIC_LIBS
+          \"${CURRENT_TARGET}\"
         )
-        add_custom_target(
-            msquic_linker_inputs
-            DEPENDS ${QUIC_DEPS_FILE}
-        )
-        add_dependencies(msquic_linker_inputs msquic_static)
-        set_property(TARGET msquic_linker_inputs PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
-
-        # Run archiver tool
-        add_custom_target(
-            msquic_lib
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            COMMAND ${CMAKE_AR} -M < ${QUIC_DEPS_FILE}
-            DEPENDS ${QUIC_DEPS_FILE}
+      endif()
+      return()
+    endif()
+
+    # Check if this is an interface target
+    get_target_property(TARGET_TYPE ${CURRENT_TARGET} TYPE)
+
+    get_target_property(TARGET_OUTPUT ${CURRENT_TARGET} OUTPUT_NAME)
+    if(NOT TARGET_OUTPUT)
+      # The target's logical name is used as the base name if the
+      # output name property isn't specified
+      set(TARGET_OUTPUT ${CURRENT_TARGET})
+    endif()
+
+    if(${TARGET_TYPE} STREQUAL "STATIC_LIBRARY")
+      get_target_property(OUTPUT_DIR ${CURRENT_TARGET} ARCHIVE_OUTPUT_DIRECTORY)
+      if(OUTPUT_DIR)
+        set(STATIC_LIB "${OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${TARGET_OUTPUT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+        set_property(
+          GLOBAL
+          APPEND
+          PROPERTY QUIC_STATIC_LIBS
+          \"${STATIC_LIB}\"
         )
+      endif()
     endif()
-    add_dependencies(msquic_lib msquic_linker_inputs)
-    set_property(TARGET msquic_lib PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
-
-    # Provide interface library to link the monolithic library
-    # NOTE: It is important that this interface library NOT link directly to
-    # msquic_static or the linker flags will inadvertently bring in symbols
-    # that are already linked as part of the static library. Users can link to
-    # msquic_static directly if they don't need the monolithic library.
-    add_library(msquic INTERFACE)
-    target_compile_definitions(msquic INTERFACE QUIC_BUILD_STATIC)
-    target_link_libraries(msquic
-        INTERFACE
-        ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_STATIC_LIBRARY_PREFIX}${QUIC_LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
-        inc
-    )
-    if (CX_PLATFORM STREQUAL "darwin")
-        target_link_libraries(msquic INTERFACE "-framework CoreFoundation" "-framework Security")
+
+    # Next, recursively invoke this function for each dependency
+
+    get_target_property(LINK_LIBS ${CURRENT_TARGET} LINK_LIBRARIES)
+    get_target_property(INTERFACE_LIBS ${CURRENT_TARGET} INTERFACE_LINK_LIBRARIES)
+    get_target_property(DEPS ${CURRENT_TARGET} LINK_DEPENDS)
+
+    if(LINK_LIBS)
+      foreach(DEP ${LINK_LIBS})
+        flatten_link_dependencies(${DEP})
+      endforeach()
+    endif()
+
+    if(INTERFACE_LIBS)
+      foreach(DEP ${INTERFACE_LIBS})
+        flatten_link_dependencies(${DEP})
+      endforeach()
     endif()
-    add_dependencies(msquic msquic_lib)
+  endfunction()
+
+  flatten_link_dependencies(msquic_static)
+
+  get_property(DEPS_LIST GLOBAL PROPERTY QUIC_STATIC_LIBS)
+  set(DEPS_STRING "")
+  foreach(line ${DEPS_LIST})
+    set(DEPS_STRING "${DEPS_STRING}${line} ")
+  endforeach(line)
+
+  # Uncomment to analyze which dependencies were traversed
+  # message(STATUS "DEPS: ${DEPS_LIST}, ${QUIC_BUILD_DIR}")
+
+  if(APPLE)
+    # Emit all linker inputs at build time to resolve generator expressions
+    set(QUIC_DEPS_FILE ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>/quicdeps.txt)
+    file(
+      GENERATE
+      OUTPUT ${QUIC_DEPS_FILE}
+      CONTENT "${DEPS_STRING}"
+    )
+    add_custom_target(
+      msquic_linker_inputs
+      DEPENDS ${QUIC_DEPS_FILE}
+    )
+    add_dependencies(msquic_linker_inputs msquic_static)
+    set_property(TARGET msquic_linker_inputs PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
+
+    # Run archiver tool
+    add_custom_target(
+      msquic_lib
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+      COMMAND libtool -static -o \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmsquic.a\" @${QUIC_DEPS_FILE}
+      DEPENDS ${QUIC_DEPS_FILE}
+    )
+  elseif(WIN32)
+    set(NODEFAULTS "")
+    foreach(EXCLUDE ${EXCLUDE_LIST})
+      string(APPEND NODEFAULTS "/NODEFAULTLIB:${EXCLUDE}${CMAKE_STATIC_LIBRARY_SUFFIX} ")
+    endforeach()
+
+    # Exclude libraries for the corresponding msvcrts
+    # https://docs.microsoft.com/en-us/cpp/error-messages/tool-errors/linker-tools-warning-lnk4098?view=msvc-160
+    string(APPEND NODEFAULTS "/NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcrtd.lib $<IF:$<CONFIG:Debug>,/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:msvcrtd.lib,/NODEFAULTLIB:libcmtd.lib>")
+    # Uncomment to inspect which libraries will have referenced symbols ignored
+    # message(STATUS "NODEFAULTS: ${NODEFAULTS}")
+
+    # Emit all linker inputs at build time to resolve generator expressions
+    set(QUIC_DEPS_FILE ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>/quicdeps.txt)
+    file(
+      GENERATE
+      OUTPUT ${QUIC_DEPS_FILE}
+      CONTENT "/OUT:\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/msquic.lib\" ${DEPS_STRING} ${NODEFAULTS}"
+    )
+    add_custom_target(
+      msquic_linker_inputs
+      DEPENDS ${QUIC_DEPS_FILE}
+    )
+    add_dependencies(msquic_linker_inputs msquic_static)
+    set_property(TARGET msquic_linker_inputs PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
+
+    # Run archiver tool (lib.exe) on our generated linker args
+    add_custom_target(
+      msquic_lib
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+      COMMAND ${CMAKE_AR} @${QUIC_DEPS_FILE}
+      COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/msquic.lib" "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}"
+      DEPENDS ${QUIC_DEPS_FILE}
+    )
+  else()
+    # Emit all linker inputs at build time to resolve generator expressions
+    set(QUIC_DEPS_FILE ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>/quicdeps.txt)
+    set(DEPS_LINES "")
+    foreach(line ${DEPS_LIST})
+      message(STATUS ${line})
+      set(DEPS_LINES "${DEPS_LINES}addlib ${line}\n")
+    endforeach(line)
+    file(
+      GENERATE
+      OUTPUT ${QUIC_DEPS_FILE}
+      CONTENT "create \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmsquic.a\"\n${DEPS_LINES}save\nend\n"
+    )
+    add_custom_target(
+      msquic_linker_inputs
+      DEPENDS ${QUIC_DEPS_FILE}
+    )
+    add_dependencies(msquic_linker_inputs msquic_static)
+    set_property(TARGET msquic_linker_inputs PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
+
+    # Run archiver tool
+    add_custom_target(
+      msquic_lib
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+      COMMAND ${CMAKE_AR} -M < ${QUIC_DEPS_FILE}
+      DEPENDS ${QUIC_DEPS_FILE}
+    )
+  endif()
+  add_dependencies(msquic_lib msquic_linker_inputs)
+  set_property(TARGET msquic_lib PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
+
+  # Provide interface library to link the monolithic library
+  # NOTE: It is important that this interface library NOT link directly to
+  # msquic_static or the linker flags will inadvertently bring in symbols
+  # that are already linked as part of the static library. Users can link to
+  # msquic_static directly if they don't need the monolithic library.
+  add_library(msquic INTERFACE)
+  target_compile_definitions(msquic INTERFACE QUIC_BUILD_STATIC)
+  target_link_libraries(
+    msquic
+    INTERFACE
+    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_STATIC_LIBRARY_PREFIX}${QUIC_LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+    inc
+  )
+  if(CX_PLATFORM STREQUAL "darwin")
+    target_link_libraries(msquic INTERFACE "-framework CoreFoundation" "-framework Security")
+  endif()
+  add_dependencies(msquic msquic_lib)
 endif()
 
 set_property(TARGET msquic PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")
 
 if(WIN32)
-    if(QUIC_UWP_BUILD)
-        target_link_libraries(msquic PUBLIC OneCoreUAP)
-    endif()
-    SET_TARGET_PROPERTIES(msquic
-        PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_BINARY_DIR}/msquic.def\"")
-elseif (CX_PLATFORM STREQUAL "linux")
-    SET_TARGET_PROPERTIES(msquic
-        PROPERTIES LINK_FLAGS "-Wl,--version-script=\"${CMAKE_CURRENT_SOURCE_DIR}/linux/exports.txt\"")
-elseif (CX_PLATFORM STREQUAL "darwin")
-    SET_TARGET_PROPERTIES(msquic
-        PROPERTIES LINK_FLAGS "-exported_symbols_list \"${CMAKE_CURRENT_SOURCE_DIR}/darwin/exports.txt\"")
+  if(QUIC_UWP_BUILD)
+    target_link_libraries(msquic PUBLIC OneCoreUAP)
+  endif()
+  set_target_properties(
+    msquic
+    PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_BINARY_DIR}/msquic.def\""
+  )
+elseif(CX_PLATFORM STREQUAL "linux")
+  set_target_properties(
+    msquic
+    PROPERTIES LINK_FLAGS "-Wl,--version-script=\"${CMAKE_CURRENT_SOURCE_DIR}/linux/exports.txt\""
+  )
+elseif(CX_PLATFORM STREQUAL "darwin")
+  set_target_properties(
+    msquic
+    PROPERTIES LINK_FLAGS "-exported_symbols_list \"${CMAKE_CURRENT_SOURCE_DIR}/darwin/exports.txt\""
+  )
 endif()
 
 if(BUILD_SHARED_LIBS)
-    target_include_directories(msquic PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
-        $<INSTALL_INTERFACE:${include_dest}>)
+  target_include_directories(
+    msquic PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
+    $<INSTALL_INTERFACE:${include_dest}>
+  )
 else()
-    target_include_directories(msquic_static INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
-        $<INSTALL_INTERFACE:${include_dest}>)
-    target_include_directories(msquic INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
-        $<INSTALL_INTERFACE:${include_dest}>)
+  target_include_directories(
+    msquic_static INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
+    $<INSTALL_INTERFACE:${include_dest}>
+  )
+  target_include_directories(
+    msquic INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
+    $<INSTALL_INTERFACE:${include_dest}>
+  )
 endif()
 
-set(PUBLIC_HEADERS
-    ../inc/msquic.h
-    ../inc/msquic_winuser.h
-    ../inc/msquic_posix.h
-    ../inc/quic_sal_stub.h)
+set(
+  PUBLIC_HEADERS
+  ../inc/msquic.h
+  ../inc/msquic_winuser.h
+  ../inc/msquic_posix.h
+  ../inc/quic_sal_stub.h
+)
 
 install(TARGETS msquic EXPORT msquic DESTINATION "${main_lib_dest}")
 install(FILES ${PUBLIC_HEADERS} DESTINATION "${include_dest}")
 
-configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake)
+#configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake)
 
-install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${msquic_dest})
+#install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${msquic_dest})
 
 if(BUILD_SHARED_LIBS)
-    install(EXPORT msquic DESTINATION ${msquic_dest})
+  #install(EXPORT msquic DESTINATION ${msquic_dest})
 endif()
 
-if (MSVC AND NOT QUIC_ENABLE_SANITIZERS AND BUILD_SHARED_LIBS)
-    target_compile_options(msquic PRIVATE /analyze)
+if(MSVC AND NOT QUIC_ENABLE_SANITIZERS AND BUILD_SHARED_LIBS)
+  target_compile_options(msquic PRIVATE /analyze)
 endif()
diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt
index f9e3062..1d4fb1d 100644
--- a/submodules/CMakeLists.txt
+++ b/submodules/CMakeLists.txt
@@ -228,7 +228,8 @@ else()
             -D__ANDROID_API__=29)
     else()
         set(OPENSSL_CONFIG_CMD ${CMAKE_CURRENT_SOURCE_DIR}/openssl/config
-            CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER})
+            CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=${CMAKE_C_FLAGS}
+            CXXFLAGS=${CMAKE_CXX_FLAGS} LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS})
     endif()
 
     # Create working and output directories as needed