MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-18 10:46:37 +02:00
Code Issues Projects Releases Wiki Activity

fix cmake sdl finding, find_package for each cmake scope

Browse Source
This commit is contained in:
Green Sky
2022-10-31 22:35:55 +01:00
committed by Erik Scholz
parent 4d0f731d8d
commit dffbad65d2
5 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/filesystem/CMakeLists.txt
View File

@ -33,15 +33,18 @@ if(NOT MM_HEADLESS)
target_compile_options(filesystem_service PUBLIC -sUSE_SDL=2)
target_link_libraries(filesystem_service PUBLIC -sUSE_SDL=2)
elseif(VCPKG_TARGET_TRIPLET)
find_package(SDL2 CONFIG REQUIRED)
target_link_libraries(filesystem_service
PUBLIC
SDL2::SDL2
PRIVATE
SDL2::SDL2main
SDL2::SDL2-static
#PRIVATE
#SDL2::SDL2main
#SDL2::SDL2-static
)
else()
#if not android or emscripten
find_package(SDL2 REQUIRED)
target_include_directories(filesystem_service PUBLIC "${SDL2_INCLUDE_DIR}")
target_link_libraries(filesystem_service PUBLIC ${SDL2_LIBRARY})
#endif

21
framework/sdl_service/CMakeLists.txt
View File

@ -27,8 +27,19 @@ target_link_libraries(sdl_service PUBLIC
if(EMSCRIPTEN)
target_compile_options(sdl_service PUBLIC -sUSE_SDL=2)
target_link_libraries(sdl_service PUBLIC -sUSE_SDL=2)
elseif(VCPKG_TARGET_TRIPLET)
find_package(SDL2 CONFIG REQUIRED)
target_link_libraries(sdl_service
PUBLIC
SDL2::SDL2
#PRIVATE
#SDL2::SDL2main
#SDL2::SDL2-static
)
else()
#if not android or emscripten
find_package(SDL2 REQUIRED)
target_include_directories(sdl_service PUBLIC "${SDL2_INCLUDE_DIR}")
target_link_libraries(sdl_service PUBLIC ${SDL2_LIBRARY})
#endif
@ -40,16 +51,6 @@ else()
target_link_libraries(sdl_service PRIVATE glad)
endif()
if(VCPKG_TARGET_TRIPLET)
target_link_libraries(sdl_service
PUBLIC
SDL2::SDL2
PRIVATE
SDL2::SDL2main
SDL2::SDL2-static
)
endif()
if(BUILD_TESTING)
add_subdirectory(test)
endif()