Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
f3890be9
Commit
f3890be9
authored
Feb 13, 2017
by
Kyle McDonald
Committed by
Davis E. King
Feb 13, 2017
Browse files
remove anaconda from X11_INCLUDE_DIR. closes #437 (#438)
parent
7747be83
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+7
-0
No files found.
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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment