[Bf-blender-cvs] [261bafa7167] decoration: cmake: cleanup redundant Wayland linking
Christian Rauch
noreply at git.blender.org
Mon Jun 1 01:20:13 CEST 2020
Commit: 261bafa7167685bfd5831c0d5dff3b6f828ce6ff
Author: Christian Rauch
Date: Wed May 20 22:42:43 2020 +0100
Branches: decoration
https://developer.blender.org/rB261bafa7167685bfd5831c0d5dff3b6f828ce6ff
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 a906dbc0bf4..804447dbef3 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)
More information about the Bf-blender-cvs
mailing list