diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:39:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:39:18 (GMT) |
| commit | d4be75be128906ea829fd0d9c9618d4543de1dac (patch) | |
| tree | fb3600f0121ae30844ff54bb552e8ba69cae6b51 /Modules | |
| parent | b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa (diff) | |
| parent | dd784dde7290b3c8c2fda4bb34b60cd20bb75a91 (diff) | |
| download | CMake-d4be75be128906ea829fd0d9c9618d4543de1dac.zip CMake-d4be75be128906ea829fd0d9c9618d4543de1dac.tar.gz CMake-d4be75be128906ea829fd0d9c9618d4543de1dac.tar.bz2 | |
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)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindX11.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index 0b63bc9..e12dc0a 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -324,6 +324,11 @@ if (UNIX) set(X11_SM_FOUND TRUE) 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 if (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) |