From 0a7499ef027795b6210ba3bfd6cac96ab92ae288 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 25 Dec 2015 15:35:04 +0100 Subject: [PATCH] Changed: Use shared libs for X11 because API doesn't change --- code/nel/src/3d/driver/opengl/CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt index 6d8efb929..18b4886ed 100644 --- a/code/nel/src/3d/driver/opengl/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt @@ -5,8 +5,11 @@ IF(NOT WIN32) FIND_LIBRARY(CARBON NAMES Carbon) FIND_LIBRARY(COCOA NAMES Cocoa) ELSE() + SET(OLD_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + SET(CMAKE_FIND_LIBRARY_SUFFIXES .so) FIND_PACKAGE(X11) FIND_PACKAGE(XF86VidMode) + SET(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_CMAKE_FIND_LIBRARY_SUFFIXES}) ENDIF() ENDIF() @@ -71,12 +74,12 @@ IF(UNIX AND NOT APPLE) TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xext_LIB}) ENDIF() # libraries needed to be linked while linking to static X11 libraries - FIND_LIBRARY(XCB_LIBRARY - NAMES xcb - HINTS ${X11_LIB_SEARCH_PATH}) - IF(XCB_LIBRARY) - TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${XCB_LIBRARY}) - ENDIF() +# FIND_LIBRARY(XCB_LIBRARY +# NAMES xcb +# HINTS ${X11_LIB_SEARCH_PATH}) +# IF(XCB_LIBRARY) +# TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${XCB_LIBRARY}) +# ENDIF() ENDIF() IF(WITH_PCH)