From a15ec3654787f30d786c5a95c29ef3cb1b7917c1 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Tue, 3 Aug 2021 11:33:50 +0300 Subject: [PATCH] attempt to fix cmake builds with libdecor --- CMakeLists.txt | 6 +++--- cmake/sdlchecks.cmake | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c311b6f14..82f873048 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2594,7 +2594,7 @@ if(SDL_SHARED) set_property(TARGET SDL2 APPEND_STRING PROPERTY COMPILE_FLAGS "-fobjc-arc") endif() if(WAYLAND_LIBDECOR) - target_include_directories(SDL2 PRIVATE "${libdecor_INCLUDE_DIRS}") + target_include_directories(SDL2 PRIVATE "${LIBDECOR_INCLUDE_DIRS}") endif() endif() @@ -2648,8 +2648,8 @@ if(SDL_STATIC) set_property(TARGET SDL2-static APPEND_STRING PROPERTY COMPILE_FLAGS "-fobjc-arc") endif() if(WAYLAND_LIBDECOR) - target_include_directories(SDL2-static PRIVATE "${libdecor_INCLUDE_DIRS}") - target_link_libraries(SDL2-static "${libdecor_LIBRARIES}") + target_include_directories(SDL2-static PRIVATE "${LIBDECOR_INCLUDE_DIRS}") + target_link_libraries(SDL2-static "${LIBDECOR_LIBRARIES}") endif() endif() diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake index dc58c5656..4d90f9a53 100644 --- a/cmake/sdlchecks.cmake +++ b/cmake/sdlchecks.cmake @@ -698,8 +698,8 @@ macro(CheckWayland) endif() if(WAYLAND_LIBDECOR) - pkg_check_modules(PKG_LIBDECOR libdecor-0) - if(PKG_LIBDECOR_FOUND) + pkg_check_modules(LIBDECOR libdecor-0) + if(LIBDECOR_FOUND) set(HAVE_WAYLAND_LIBDECOR TRUE) FindLibraryAndSONAME(decor-0) set(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR "\"${DECOR_0_LIB_SONAME}\"")