Fix compile with CMake 3.2.1, by Kevin Seroux
Explicitly link X11, as this no longer comes with OpenGL
This commit is contained in:
parent
27a4be5d87
commit
14405fe2e3
3 changed files with 8 additions and 1 deletions
|
@ -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)
|
||||
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Reference in a new issue