From: Rebecca N. Palmer Date: Fri, 3 Apr 2015 18:15:52 +0000 (+0100) Subject: Fix compile with CMake 3.2.1, by Kevin Seroux X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=14405fe2e397b9a6ab9b004cb8c7459eeb41ec59;p=flightgear.git Fix compile with CMake 3.2.1, by Kevin Seroux Explicitly link X11, as this no longer comes with OpenGL --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c881c3220..c443f588e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,7 @@ IF(APPLE) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") find_package(Threads REQUIRED) + find_package(X11 REQUIRED) set(USE_DBUS_DEFAULT 1) diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index 949b379dd..4b6926e9b 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -130,7 +130,9 @@ endif() if (CRASHRPT_FOUND) target_link_libraries(fgfs ${CRASHRPT_LIBRARY}) endif() - +if(X11_FOUND) + target_link_libraries(fgfs ${X11_LIBRARIES}) +endif() target_link_libraries(fgfs ${SQLITE3_LIBRARY} ${SIMGEAR_LIBRARIES} diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt index 165be7484..bfc52ad50 100644 --- a/utils/fgviewer/CMakeLists.txt +++ b/utils/fgviewer/CMakeLists.txt @@ -42,6 +42,10 @@ else() endif() add_executable(fgviewer ${FGVIEWER_SOURCES} ${FGVIEWER_RTI_SOURCES}) +if(X11_FOUND) + target_link_libraries(fgviewer ${X11_LIBRARIES}) +endif() + target_link_libraries(fgviewer ${SIMGEAR_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES}