Skip to content
Snippets Groups Projects
Commit 45c6743e authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix Fedora messing up fltk-config (workaround for bug #417)

parent 1ea71b5b
No related branches found
No related tags found
No related merge requests found
Pipeline #2178 passed
...@@ -559,6 +559,17 @@ if(ENABLE_FLTK) ...@@ -559,6 +559,17 @@ if(ENABLE_FLTK)
endif(FLTK_PNG) endif(FLTK_PNG)
endif(FLTK_FOUND) endif(FLTK_FOUND)
endif(NOT HAVE_FLTK) endif(NOT HAVE_FLTK)
# workaround for Fedora messing up fltk-config (see issue #417)
if(HAVE_FLTK AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
string(REGEX MATCH "X11" FLTK_X11 ${FLTK_LIBRARIES})
if(NOT FLTK_X11)
find_package(X11)
if(X11_FOUND)
list(APPEND EXTERNAL_INCLUDES ${X11_INCLUDE_DIR})
list(APPEND EXTERNAL_LIBRARIES ${X11_LIBRARIES})
endif(X11_FOUND)
endif(NOT FLTK_X11)
endif(HAVE_FLTK AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif(ENABLE_FLTK) endif(ENABLE_FLTK)
if(ENABLE_NATIVE_FILE_CHOOSER) if(ENABLE_NATIVE_FILE_CHOOSER)
......
  • Author Owner

    @Koen and @dbeurle : can you check that this workaround works on your systems?

  • Developer

    Trying it out now - computer is thermal throttling in this hot weather!

  • Developer

    Works for me - thanks.

  • Developer

    works for me as well; btw issue is not specific to fedora; I am on suse leap 42.3

    Thanks !

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment