@@ -101,16 +101,12 @@ if(GS_INCLUDE_VOICE)
101101 FetchContent_Declare (
102102 speex_git
103103 GIT_REPOSITORY https://github.com/TheAssemblyArmada/speex.git
104- GIT_TAG 1462ebd7f0b022567dafbd1b0e645994cff78577
104+ GIT_TAG a9a8d07faab4851869f0c683e9d9e38a7ec6069f
105+ EXCLUDE_FROM_ALL
105106 )
106107
107- # We don't use FetchContent_MakeAvailable here because we don't want all speex targets including, just our dependencies.
108- FetchContent_GetProperties (speex_git)
109- if (NOT speex_git_POPULATED)
110- FetchContent_Populate (speex_git)
111- set (ENABLE_PACKAGE_CONFIG FALSE )
112- add_subdirectory (${speex_git_SOURCE_DIR} ${speex_git_BINARY_DIR} EXCLUDE_FROM_ALL )
113- endif ()
108+ set (ENABLE_PACKAGE_CONFIG FALSE )
109+ FetchContent_MakeAvailable (speex_git)
114110 set (SPEEX_LIBRARIES speex)
115111 endif ()
116112endif ()
@@ -124,18 +120,13 @@ if(GS_OPENSSL)
124120 FetchContent_Declare (
125121 openssl_git
126122 GIT_REPOSITORY https://github.com/janbar/openssl-cmake.git
127- GIT_TAG e0224176e43dbbfb5308ae5f3d44611180138419
123+ GIT_TAG b0ac69581958cd658364147da9057da89a01c394
124+ EXCLUDE_FROM_ALL
128125 )
129126
130- # We don't use FetchContent_MakeAvailable here because we don't want all OpenSSL targets including, just our dependencies.
131- FetchContent_GetProperties (openssl_git)
132- if (NOT openssl_git_POPULATED)
133- FetchContent_Populate (openssl_git)
134- set (ENABLE_PACKAGE_CONFIG FALSE )
135- # TODO currently we don't support linking the static runtime.
136- set (MSVC_DYNAMIC_RUNTIME TRUE )
137- add_subdirectory (${openssl_git_SOURCE_DIR} ${openssl_git_BINARY_DIR} EXCLUDE_FROM_ALL )
138- endif ()
127+ set (ENABLE_PACKAGE_CONFIG FALSE )
128+ set (MSVC_DYNAMIC_RUNTIME TRUE )
129+ FetchContent_MakeAvailable (openssl_git)
139130 add_library (OpenSSL::SSL ALIAS ssl )
140131 endif ()
141132endif ()
0 commit comments