Browse Source

attempt to fix cmake builds with libdecor

Ozkan Sezer 3 years ago
parent
commit
a15ec36547
2 changed files with 5 additions and 5 deletions
  1. 3 3
      CMakeLists.txt
  2. 2 2
      cmake/sdlchecks.cmake

+ 3 - 3
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()
 

+ 2 - 2
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}\"")