widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands.

Commit message:
Link GL libraries insted of setting flags

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1836107 in widelands: "Build order for -lGL does not work for openSUSE Tumbleweed"
  https://bugs.launchpad.net/widelands/+bug/1836107

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug_1836107_lGL/+merge/370334

See https://bugs.launchpad.net/widelands/+bug/1836107

One should may apply a better commit message ;)
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2019-06-15 09:13:13 +0000
+++ CMakeLists.txt	2019-07-18 17:54:01 +0000
@@ -182,7 +182,7 @@
 
 # This is set to avoid linker errors when using GLVND-libs on Linux
 if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
-   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
+   link_libraries("GL")
    add_compile_definitions(WL_USE_GLVND)
    message(STATUS "Adding linker flags for GLVND.")
 endif()