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
ad341810
Commit
ad341810
authored
Sep 24, 2011
by
Davis King
Browse files
Increased usability of the dlib CMakeLists.txt file slightly.
parent
841615f5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+4
-2
No files found.
dlib/CMakeLists.txt
View file @
ad341810
...
@@ -199,6 +199,8 @@ if (NOT DLIB_ISO_CPP_ONLY)
...
@@ -199,6 +199,8 @@ if (NOT DLIB_ISO_CPP_ONLY)
get_filename_component
(
sqlite_path2
${
sqlite_path
}
PATH CACHE
)
get_filename_component
(
sqlite_path2
${
sqlite_path
}
PATH CACHE
)
include_directories
(
${
sqlite_path2
}
)
include_directories
(
${
sqlite_path2
}
)
set
(
dlib_needed_libraries
${
dlib_needed_libraries
}
${
sqlite
}
)
set
(
dlib_needed_libraries
${
dlib_needed_libraries
}
${
sqlite
}
)
else
()
set
(
DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING
${
DLIB_LINK_WITH_SQLITE3_STR
}
FORCE
)
endif
()
endif
()
mark_as_advanced
(
sqlite sqlite_path sqlite_path2
)
mark_as_advanced
(
sqlite sqlite_path sqlite_path2
)
endif
()
endif
()
...
@@ -214,13 +216,13 @@ include(TestForSTDNamespace)
...
@@ -214,13 +216,13 @@ include(TestForSTDNamespace)
include
(
TestForANSIStreamHeaders
)
include
(
TestForANSIStreamHeaders
)
if
(
DLIB_LINK_WITH_LIBPNG
)
if
(
DLIB_LINK_WITH_LIBPNG
AND NOT DLIB_ISO_CPP_ONLY
)
add_global_define
(
DLIB_PNG_SUPPORT
)
add_global_define
(
DLIB_PNG_SUPPORT
)
else
()
else
()
remove_global_define
(
DLIB_PNG_SUPPORT
)
remove_global_define
(
DLIB_PNG_SUPPORT
)
endif
()
endif
()
if
(
DLIB_LINK_WITH_LIBJPEG
)
if
(
DLIB_LINK_WITH_LIBJPEG
AND NOT DLIB_ISO_CPP_ONLY
)
add_global_define
(
DLIB_JPEG_SUPPORT
)
add_global_define
(
DLIB_JPEG_SUPPORT
)
else
()
else
()
remove_global_define
(
DLIB_JPEG_SUPPORT
)
remove_global_define
(
DLIB_JPEG_SUPPORT
)
...
...
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