diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-10 15:19:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-10 15:25:10 (GMT) |
| commit | 69d26f150246bab12659ded37999bc2ff385c32c (patch) | |
| tree | 822bf3f7108b986ec0a876f42966697ba92bae11 /Modules/FindX11.cmake | |
| parent | 804d324880924221d22cf8fd3420210c7361c8f4 (diff) | |
| parent | 98844ec9db5fe4dc4e236f3852d4f3e88a4a9e76 (diff) | |
| download | CMake-69d26f150246bab12659ded37999bc2ff385c32c.zip CMake-69d26f150246bab12659ded37999bc2ff385c32c.tar.gz CMake-69d26f150246bab12659ded37999bc2ff385c32c.tar.bz2 | |
Merge topic 'FPHSA-name-mismatches-chained-via-include'
98844ec9db FPHSA: detect inclusion between find modules
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Logan Barnes <barneslt63@gmail.com>
Merge-request: !5107
Diffstat (limited to 'Modules/FindX11.cmake')
| -rw-r--r-- | Modules/FindX11.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index 958a22e..778da9b 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -413,9 +413,17 @@ if (UNIX) endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) + if (CMAKE_FIND_PACKAGE_NAME STREQUAL "FLTK") + # FindFLTK include()'s this module. It's an old pattern, but rather than + # trying to suppress this from outside the module (which is then sensitive + # to the contents, detect the case in this module and suppress it + # explicitly. + set(FPHSA_NAME_MISMATCHED 1) + endif () find_package_handle_standard_args(X11 REQUIRED_VARS X11_X11_INCLUDE_PATH X11_X11_LIB HANDLE_COMPONENTS) + unset(FPHSA_NAME_MISMATCHED) if(X11_FOUND) include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) |