Malte LangermannandGitHub
8d91c0ae95
* chore(pc): convert simu/simulator/companion to use SDL2 * switch companion builds to SDL2 - OSX is not converted the linux change is done a bit hacky, it should be done by updating the EdgeTX docker container * update build system setup scripts * add compatibility for old and new SDL2 cmake integration * fix windows installer * fix simulator audio on windows by using DirectSound vie SDL2 * fix windows audio with SDL2 enable simu for windows builds * remove workflow changes for linux builds, this needs to be fixed in the build environment * fix OSX build, thx @pafleraf * fix windows audio for companion and simulator with SDL2 * select SDL2 branch of the build-docker environment * Revert "select SDL2 branch of the build-docker environment" This reverts commit da801609d78e1aed513ad7d9d8ab3ebded2900b9. * fix tests with SDL2
72 lines
2.1 KiB
CMake
72 lines
2.1 KiB
CMake
|
|
option(DISABLE_COMPANION "Disable building companion and simulators" OFF)
|
|
|
|
# if(WIN32)
|
|
# set(WIN_EXTRA_LIBS_PATH "C:/Programs" CACHE PATH
|
|
# "Base path to extra libs/headers on Windows (SDL & pthreads folders should be in here).")
|
|
# list(APPEND CMAKE_PREFIX_PATH "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/SDL") # hints for FindSDL
|
|
# endif()
|
|
|
|
# libfox
|
|
find_package(Fox QUIET) # QUIET not working on WIN32?
|
|
if (FOX_FOUND)
|
|
message(STATUS "Foxlib found at ${FOX_LIBRARY}")
|
|
else()
|
|
message("Libfox not found, simu target will not be available")
|
|
endif()
|
|
|
|
if(NOT DISABLE_COMPANION)
|
|
include(QtDefs)
|
|
endif(NOT DISABLE_COMPANION)
|
|
|
|
if(Qt5Core_FOUND OR FOX_FOUND)
|
|
set(SDL2_BUILDING_LIBRARY YES) # this prevents FindSDL from appending SDLmain lib to the results, which we don't want
|
|
find_package("SDL2")
|
|
if(SDL2_FOUND)
|
|
message(STATUS "SDL2 Lib: ${SDL2_LIBRARIES}; Headers: ${SDL2_INCLUDE_DIRS}")
|
|
else()
|
|
message(STATUS "SDL not found! Simulator audio, and joystick inputs, will not work.")
|
|
endif()
|
|
endif()
|
|
|
|
# Windows-specific includes and libs shared by sub-projects
|
|
if(WIN32)
|
|
list(APPEND WIN_INCLUDE_DIRS "${RADIO_SRC_DIR}/thirdparty/windows/dirent")
|
|
# TODO: is that still necessary?
|
|
set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
|
|
set(CMAKE_C_USE_RESPONSE_FILE_FOR_LIBRARIES OFF)
|
|
set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
|
|
set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_LIBRARIES OFF)
|
|
endif()
|
|
|
|
# google tests
|
|
include(DownloadGTest)
|
|
|
|
add_custom_target(tests-radio
|
|
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gtests-radio
|
|
DEPENDS gtests-radio
|
|
)
|
|
|
|
if(Qt5Core_FOUND AND NOT DISABLE_COMPANION)
|
|
add_subdirectory(${COMPANION_SRC_DIRECTORY})
|
|
add_custom_target(tests-companion
|
|
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gtests-companion
|
|
DEPENDS gtests-companion
|
|
)
|
|
add_custom_target(gtests
|
|
DEPENDS gtests-radio gtests-companion
|
|
)
|
|
add_custom_target(tests
|
|
DEPENDS tests-radio tests-companion
|
|
)
|
|
else()
|
|
add_custom_target(gtests
|
|
DEPENDS gtests-radio
|
|
)
|
|
add_custom_target(tests
|
|
DEPENDS tests-radio
|
|
)
|
|
endif()
|
|
|
|
set(IGNORE "${ARM_TOOLCHAIN_DIR}")
|