Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Rauch <Rauch.Christian@gmx.de>2020-05-21 00:42:43 +0300
committerChristian Rauch <Rauch.Christian@gmx.de>2021-06-03 20:18:27 +0300
commitb5d7fb813f3b2a84059fa42f0005e87ef18883d7 (patch)
tree0ba64383578beb07f7de00ac8bd7f5b0727c22a4 /build_files
parentbb16f9697301e8f8aba8f0016fd506706ba37afc (diff)
cmake: use absolute path for Wayland libraries
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/macros.cmake8
-rw-r--r--build_files/cmake/platform/platform_unix.cmake14
2 files changed, 6 insertions, 16 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 813ac013cdf..5ae5ed7c29e 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -596,14 +596,6 @@ function(SETUP_LIBDIRS)
link_directories(${GMP_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 7791112c6ab..dec12bde89c 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -578,14 +578,12 @@ 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()
+ list(APPEND PLATFORM_LINKLIBS
+ ${wayland-client_LINK_LIBRARIES}
+ ${wayland-egl_LINK_LIBRARIES}
+ ${xkbcommon_LINK_LIBRARIES}
+ ${wayland-cursor_LINK_LIBRARIES}
+ )
endif()
if(WITH_GHOST_X11)