diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-12-17 15:23:59 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-12-17 15:24:35 +0300 |
| commit | 9258b70453df3c806ea4d056217d6be7767c4a9a (patch) | |
| tree | 048246879f0291bade360eadfb625fbb3bea8a2c | |
| parent | cf2ebaf27c78b3f8f79d9d014ca2261228f87e70 (diff) | |
Explicitly link X11 libraries
Fix X11 library underlinking, which was breaking Debian and Ubuntu
packages.
From Ubuntu Hirsute changelog:
```
blender (2.83.5+dfsg-4ubuntu1) hirsute; urgency=medium
* Try to also link ghost library with x11, needed because of missing
XConvertSelection symbol link (used in ghost static library).
* Don't use gold, but switch to bfd linker that seems to be working better
on ppc64el.
-- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 11 Nov 2020 14:17:29 +0100
```
Reviewed by: sybren
Differential Revision: https://developer.blender.org/D9617
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index e8611839aea..1739659ab88 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -187,6 +187,11 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) ${X11_X11_INCLUDE_PATH} ) + list(APPEND LIB + ${X11_X11_LIB} + ${X11_Xrender_LIB} + ) + list(APPEND SRC intern/GHOST_DisplayManagerX11.cpp intern/GHOST_SystemX11.cpp @@ -238,6 +243,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) list(APPEND INC_SYS ${X11_xf86vmode_INCLUDE_PATH} ) + list(APPEND LIB + ${X11_Xf86vmode_LIB} + ) endif() if(WITH_X11_XFIXES) @@ -245,6 +253,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) list(APPEND INC_SYS ${X11_Xfixes_INCLUDE_PATH} ) + list(APPEND LIB + ${X11_Xfixes_LIB} + ) endif() if(WITH_X11_ALPHA) @@ -256,6 +267,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) list(APPEND INC_SYS ${X11_Xinput_INCLUDE_PATH} ) + list(APPEND LIB + ${X11_Xinput_LIB} + ) endif() add_definitions(-DWITH_GHOST_X11) |