Skip to content

GitLab

"...llama.cpp/git@developer.sourcefind.cn:OpenDAS/ollama.git" did not exist on "1c094038bcfe0ca40c90273cb7228f8ad34b7417"
Commit f3890be9 authored by Kyle McDonald's avatar Kyle McDonald Committed by Davis E. King
Browse files

remove anaconda from X11_INCLUDE_DIR. closes #437 (#438)

parent 7747be83
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
dlib/CMakeLists.txt
View file @ f3890be9
...@@ -243,6 +243,13 @@ if (NOT TARGET dlib) ...@@ -243,6 +243,13 @@ if (NOT TARGET dlib)
if (NOT DLIB_NO_GUI_SUPPORT) if (NOT DLIB_NO_GUI_SUPPORT)
find_package(X11 QUIET) find_package(X11 QUIET)
if (X11_FOUND) if (X11_FOUND)
# If both X11 and anaconda are installed, it's possible for the
# anaconda path to appear before /opt/X11, so we remove anaconda.
foreach (ITR ${X11_INCLUDE_DIR})
if ("${ITR}" MATCHES "(.*)anaconda(.*)")
list (REMOVE_ITEM X11_INCLUDE_DIR ${ITR})
endif ()
endforeach(ITR)
include_directories(${X11_INCLUDE_DIR}) include_directories(${X11_INCLUDE_DIR})
set (dlib_needed_libraries ${dlib_needed_libraries} ${X11_LIBRARIES}) set (dlib_needed_libraries ${dlib_needed_libraries} ${X11_LIBRARIES})
else() else()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment