FreeDV
/
freedv-gui
mirror of https://github.com/drowe67/freedv-gui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Debug Windows build size issue. (#1386) 

* Debug Windows build size issue.

* Revert previous change and MakeAvailable usage for wxWidgets.

* Use non-deprecated version of FetchContent_Populate.

* Need to provide other parameters to Populate.

* Add EXCLUDE_FROM_ALL for new enough CMake.

* Add PR #1386 to changelog.
ms-icom-retries
Mooneer Salem 2026-06-11 16:38:30 -07:00 committed by GitHub
parent d193a81c44
commit b21d3b7750
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
USER_MANUAL.md
View File

@ -951,7 +951,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
* Move Tune button into Control widget for improved usability. (PR #1377) - thanks @barjac!
* Restore heard station list on launch. (PR #1358) - thanks @barjac!
3. Build system:
* Clear CMake deprecation warnings in FreeDV. (PR #1383)
* Clear CMake deprecation warnings in FreeDV. (PR #1383, #1386)
4. Other:
* FlexRadio/KA9Q integrations moved to freedv-integrations repo. (PR #1368)

39
cmake/BuildWxWidgets.cmake
View File

@ -34,17 +34,36 @@ set(wxUSE_WINSOCK2 ON CACHE BOOL "Use WinSock2" FORCE)
endif(WIN32)
include(FetchContent)
FetchContent_Declare(
wxWidgets
GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets.git
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_TAG v${WXWIDGETS_VERSION}
PATCH_COMMAND git apply ${CMAKE_SOURCE_DIR}/cmake/wxWidgets-Direct2D-color-font.patch
UPDATE_DISCONNECTED 1
)
FetchContent_MakeAvailable(wxWidgets)
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28.0")
FetchContent_Declare(
wxWidgets
GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets.git
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_TAG v${WXWIDGETS_VERSION}
PATCH_COMMAND git apply ${CMAKE_SOURCE_DIR}/cmake/wxWidgets-Direct2D-color-font.patch
UPDATE_DISCONNECTED 1
EXCLUDE_FROM_ALL
)
FetchContent_MakeAvailable(wxWidgets)
else()
FetchContent_Declare(
wxWidgets
GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets.git
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_TAG v${WXWIDGETS_VERSION}
PATCH_COMMAND git apply ${CMAKE_SOURCE_DIR}/cmake/wxWidgets-Direct2D-color-font.patch
UPDATE_DISCONNECTED 1
)
FetchContent_GetProperties(wxWidgets)
if(NOT wxwidgets_POPULATED)
FetchContent_Populate(wxWidgets)
add_subdirectory(${wxwidgets_SOURCE_DIR} ${wxwidgets_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
endif()
# Override some CXX flags to prevent wxWidgets build failures
if(APPLE)

35
cmake/Buildportaudio-2.0.cmake
View File

@ -2,17 +2,34 @@
#set(PA_ENABLE_DEBUG_OUTPUT ON CACHE STRING "Enable debug output")
include(FetchContent)
FetchContent_Declare(
portaudio
GIT_REPOSITORY https://github.com/PortAudio/portaudio.git
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_TAG master
)
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28.0")
FetchContent_Declare(
portaudio
GIT_REPOSITORY https://github.com/PortAudio/portaudio.git
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_TAG master
EXCLUDE_FROM_ALL
)
FetchContent_MakeAvailable(portaudio)
else()
FetchContent_Declare(
portaudio
GIT_REPOSITORY https://github.com/PortAudio/portaudio.git
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_TAG master
)
FetchContent_GetProperties(portaudio)
if(NOT portaudio_POPULATED)
FetchContent_Populate(portaudio)
add_subdirectory(${portaudio_SOURCE_DIR} ${portaudio_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
endif()
FetchContent_MakeAvailable(portaudio)
list(APPEND FREEDV_PACKAGE_SEARCH_PATHS ${portaudio_BINARY_DIR})
list(APPEND FREEDV_LINK_LIBS portaudio)
list(APPEND FREEDV_STATIC_DEPS portaudio)