From 8d667eb5c8dcf6649213b3241ea46b88aa10694b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 31 Jan 2021 01:37:07 +0200 Subject: [PATCH] add /usr/X11R6/include to headers and /usr/X11R6/lib to link directories on BSD fixes test build on OpenBSD Signed-off-by: Ivailo Monev --- CMakeLists.txt | 8 ++++---- cmake/modules/KatieBuildMacros.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 626ffb439..78af744e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,13 +38,13 @@ cmake_policy(SET CMP0063 NEW) # LLVM linker does not have a default library search path, add some directories known to contain # system wide libraries. the headers search path is also incomplete if(CMAKE_SYSTEM_NAME MATCHES "BSD") - foreach(incdir /usr/X11R7/include /usr/pkg/include /usr/local/include /usr/include) - if (EXISTS "${incdir}") + foreach(incdir /usr/X11R6/include /usr/X11R7/include /usr/pkg/include /usr/local/include /usr/include) + if(EXISTS "${incdir}") include_directories(${incdir}) endif() endforeach() - foreach(linkdir /usr/X11R7/lib /usr/pkg/lib /usr/local/lib /usr/lib /lib) - if (EXISTS "${linkdir}") + foreach(linkdir /usr/X11R6/lib /usr/X11R7/lib /usr/pkg/lib /usr/local/lib /usr/lib /lib) + if(EXISTS "${linkdir}") link_directories(${linkdir}) endif() endforeach() diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index d3b976661..91de8ee56 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -16,8 +16,8 @@ endfunction() # a function to check for C function/definition, works for external functions function(KATIE_CHECK_DEFINED FORDEFINITION FROMHEADER) # see comment in top-level CMake file - set(CMAKE_REQUIRED_INCLUDES /usr/X11R7/include /usr/pkg/include /usr/local/include /usr/include) - set(CMAKE_REQUIRED_LINK_OPTIONS -L/usr/X11R7/lib -L/usr/pkg/lib -L/usr/local/lib -L/usr/lib -L/lib) + set(CMAKE_REQUIRED_INCLUDES /usr/X11R6/include /usr/X11R7/include /usr/pkg/include /usr/local/include /usr/include) + set(CMAKE_REQUIRED_LINK_OPTIONS -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/pkg/lib -L/usr/local/lib -L/usr/lib -L/lib) check_cxx_source_compiles( " #include -- 2.11.0