nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-10 07:38:06 -05:00
Code Issues Projects Releases Wiki Activity

Stop trying to include X11 headers in non-GTK builds.

Browse Source 
In commit 732ec31a17a7fea I made the check for libX11 conditional on
GTK - but I forgot that if we're building without GTK, I should
_define_ NOT_X_WINDOWS, rather than leaving it undefined. As a result,
the build would fail on files like unix/utils/x11_ignore_error.c.
This commit is contained in:
Simon Tatham 2022-09-19 20:21:01 +01:00
parent 864b4c27fa
commit 9fcfd679b4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/platforms/unix.cmake
View File

@ -96,6 +96,10 @@ if(GTK_FOUND)
endif()
endfunction()
check_x11()
else()
# If we didn't even have GTK, behave as if X11 is not available.
# (There's nothing useful we could do with it even if there was.)
set(NOT_X_WINDOWS ON)
endif()
include_directories(${CMAKE_SOURCE_DIR}/charset ${GTK_INCLUDE_DIRS} ${X11_INCLUDE_DIR})