kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindX11-duplicate-includes-13316' 

dd784dd FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list
97c338b FindX11: remove duplicates from X11 include path list (#13316)
This commit is contained in:
David Cole 2012-08-20 15:39:18 -04:00 committed by CMake Topic Stage
parent b7f3cc22c3 dd784dde72
commit d4be75be12
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindX11.cmake
View File

@ -324,6 +324,11 @@ if (UNIX)
set(X11_SM_FOUND TRUE) set(X11_SM_FOUND TRUE)
endif() endif()
# Most of the X11 headers will be in the same directories, avoid
# creating a huge list of duplicates.
if (X11_INCLUDE_DIR)
list(REMOVE_DUPLICATES X11_INCLUDE_DIR)
endif ()
# Deprecated variable for backwards compatibility with CMake 1.4 # Deprecated variable for backwards compatibility with CMake 1.4
if (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) if (X11_X11_INCLUDE_PATH AND X11_LIBRARIES)