Merge remote-tracking branch 'svn/trunk' into git_master
This commit is contained in:
commit
012936e84d
@ -312,8 +312,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
||||
INCLUDE(CheckIncludeFiles)
|
||||
IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
|
||||
FIND_PACKAGE(X11 REQUIRED)
|
||||
INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
|
||||
LIST(APPEND LIBS ${X11_LIBRARIES})
|
||||
INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH})
|
||||
LIST(APPEND LIBS ${X11_X11_LIB})
|
||||
IF(X11_Xrandr_FOUND)
|
||||
SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
|
||||
LIST(APPEND LIBS ${X11_Xrandr_LIB})
|
||||
|
Reference in New Issue
Block a user