[Bf-blender-cvs] [910f37981e7] decoration: cmake: cleanup redundant Wayland linking

[Christian Rauch]

Commit: 910f37981e7bb3d84148c47bde4884bcbd91eff9
Author: Christian Rauch
Date:   Wed May 20 22:42:43 2020 +0100
Branches: decoration
https://developer.blender.org/rB910f37981e7bb3d84148c47bde4884bcbd91eff9

cmake: cleanup redundant Wayland linking

===================================================================

M	build_files/cmake/macros.cmake
M	build_files/cmake/platform/platform_unix.cmake

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index d99e46ce76e..6287da55580 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -440,14 +440,6 @@ function(SETUP_LIBDIRS)
       link_directories(${HDF5_LIBPATH})
     endif()
 
-    if(WITH_GHOST_WAYLAND)
-      link_directories(
-        ${wayland-client_LIBRARY_DIRS}
-        ${wayland-egl_LIBRARY_DIRS}
-        ${xkbcommon_LIBRARY_DIRS}
-        ${wayland-cursor_LIBRARY_DIRS})
-    endif()
-
     if(WIN32 AND NOT UNIX)
       link_directories(${PTHREADS_LIBPATH})
     endif()
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 6e00a2dec7b..210e7f68c10 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -515,14 +515,18 @@ if(WITH_GHOST_WAYLAND)
 
   set(WITH_GL_EGL ON)
 
-  if(WITH_GHOST_WAYLAND)
-    list(APPEND PLATFORM_LINKLIBS
-      ${wayland-client_LIBRARIES}
-      ${wayland-egl_LIBRARIES}
-      ${xkbcommon_LIBRARIES}
-      ${wayland-cursor_LIBRARIES}
-    )
-  endif()
+  link_directories(
+    ${wayland-client_LIBRARY_DIRS}
+    ${wayland-egl_LIBRARY_DIRS}
+    ${xkbcommon_LIBRARY_DIRS}
+    ${wayland-cursor_LIBRARY_DIRS})
+
+  list(APPEND PLATFORM_LINKLIBS
+    ${wayland-client_LIBRARIES}
+    ${wayland-egl_LIBRARIES}
+    ${xkbcommon_LIBRARIES}
+    ${wayland-cursor_LIBRARIES}
+  )
 endif()
 
 if(WITH_GHOST_X11)