encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

attempt to fix cmake builds with libdecor

This commit is contained in:
Ozkan Sezer 2021-08-03 11:33:50 +03:00
parent 8726f500ef
commit a15ec36547
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2594,7 +2594,7 @@ if(SDL_SHARED)
set_property(TARGET SDL2 APPEND_STRING PROPERTY COMPILE_FLAGS "-fobjc-arc") set_property(TARGET SDL2 APPEND_STRING PROPERTY COMPILE_FLAGS "-fobjc-arc")
endif() endif()
if(WAYLAND_LIBDECOR) if(WAYLAND_LIBDECOR)
target_include_directories(SDL2 PRIVATE "${libdecor_INCLUDE_DIRS}") target_include_directories(SDL2 PRIVATE "${LIBDECOR_INCLUDE_DIRS}")
endif() endif()
endif() endif()
@ -2648,8 +2648,8 @@ if(SDL_STATIC)
set_property(TARGET SDL2-static APPEND_STRING PROPERTY COMPILE_FLAGS "-fobjc-arc") set_property(TARGET SDL2-static APPEND_STRING PROPERTY COMPILE_FLAGS "-fobjc-arc")
endif() endif()
if(WAYLAND_LIBDECOR) if(WAYLAND_LIBDECOR)
target_include_directories(SDL2-static PRIVATE "${libdecor_INCLUDE_DIRS}") target_include_directories(SDL2-static PRIVATE "${LIBDECOR_INCLUDE_DIRS}")
target_link_libraries(SDL2-static "${libdecor_LIBRARIES}") target_link_libraries(SDL2-static "${LIBDECOR_LIBRARIES}")
endif() endif()
endif() endif()

4
cmake/sdlchecks.cmake
View File

@ -698,8 +698,8 @@ macro(CheckWayland)
endif() endif()
if(WAYLAND_LIBDECOR) if(WAYLAND_LIBDECOR)
pkg_check_modules(PKG_LIBDECOR libdecor-0) pkg_check_modules(LIBDECOR libdecor-0)
if(PKG_LIBDECOR_FOUND) if(LIBDECOR_FOUND)
set(HAVE_WAYLAND_LIBDECOR TRUE) set(HAVE_WAYLAND_LIBDECOR TRUE)
FindLibraryAndSONAME(decor-0) FindLibraryAndSONAME(decor-0)
set(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR "\"${DECOR_0_LIB_SONAME}\"") set(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR "\"${DECOR_0_LIB_SONAME}\"")