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
f8adfbfd
"git@developer.sourcefind.cn:OpenDAS/vision.git" did not exist on "665b835527d9aac8d5fb21eb96b5d080e9ff3d78"
Commit
f8adfbfd
authored
Feb 28, 2018
by
Davis King
Browse files
Fixed spelling and improved error message.
parent
2f81256f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+3
-3
dlib/config.h.in
dlib/config.h.in
+1
-1
dlib/test_for_odr_violations.cpp
dlib/test_for_odr_violations.cpp
+2
-2
dlib/test_for_odr_violations.h
dlib/test_for_odr_violations.h
+3
-3
No files found.
dlib/CMakeLists.txt
View file @
f8adfbfd
...
@@ -748,9 +748,9 @@ if (NOT TARGET dlib)
...
@@ -748,9 +748,9 @@ if (NOT TARGET dlib)
# Do this so that dlib/config.h can record the version of dlib it's configured with
# Do this so that dlib/config.h can record the version of dlib it's configured with
# and ultimately issue a linker error to people who try to use a binary dlib that is
# and ultimately issue a linker error to people who try to use a binary dlib that is
# the wrong version.
# the wrong version.
set
(
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
set
(
DLIB_CHECK_FOR_VERSION_MISMATCH
DLIB_VERSION_
CHECK
_
${
CPACK_PACKAGE_VERSION_MAJOR
}
_
${
CPACK_PACKAGE_VERSION_MINOR
}
_
${
CPACK_PACKAGE_VERSION_PATCH
}
)
DLIB_VERSION_
MISMATCH_CHECK__EXPECTED_VERSION
_
${
CPACK_PACKAGE_VERSION_MAJOR
}
_
${
CPACK_PACKAGE_VERSION_MINOR
}
_
${
CPACK_PACKAGE_VERSION_PATCH
}
)
target_compile_options
(
dlib PRIVATE
"-DDLIB_CHECK_FOR_VERSION_MIS
S
MATCH=
${
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
}
"
)
target_compile_options
(
dlib PRIVATE
"-DDLIB_CHECK_FOR_VERSION_MISMATCH=
${
DLIB_CHECK_FOR_VERSION_MISMATCH
}
"
)
endif
()
endif
()
...
...
dlib/config.h.in
View file @
f8adfbfd
...
@@ -30,5 +30,5 @@
...
@@ -30,5 +30,5 @@
// This variable allows dlib/test_for_odr_violations.h to catch people who mistakenly use
// This variable allows dlib/test_for_odr_violations.h to catch people who mistakenly use
// headers from one version of dlib with a compiled dlib binary from a different dlib version.
// headers from one version of dlib with a compiled dlib binary from a different dlib version.
#cmakedefine DLIB_CHECK_FOR_VERSION_MIS
S
MATCH @DLIB_CHECK_FOR_VERSION_MIS
S
MATCH@
#cmakedefine DLIB_CHECK_FOR_VERSION_MISMATCH @DLIB_CHECK_FOR_VERSION_MISMATCH@
dlib/test_for_odr_violations.cpp
View file @
f8adfbfd
...
@@ -36,8 +36,8 @@ extern "C"
...
@@ -36,8 +36,8 @@ extern "C"
#ifdef DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
#ifdef DLIB_CHECK_FOR_VERSION_MISMATCH
const
int
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
=
0
;
const
int
DLIB_CHECK_FOR_VERSION_MISMATCH
=
0
;
#endif
#endif
}
}
...
...
dlib/test_for_odr_violations.h
View file @
f8adfbfd
...
@@ -46,9 +46,9 @@ extern "C"
...
@@ -46,9 +46,9 @@ extern "C"
// Cause the user to get a linker error if they try to use header files from one version of
// Cause the user to get a linker error if they try to use header files from one version of
// dlib with the compiled binary from a different version of dlib.
// dlib with the compiled binary from a different version of dlib.
#ifdef DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
#ifdef DLIB_CHECK_FOR_VERSION_MISMATCH
const
extern
int
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
;
const
extern
int
DLIB_CHECK_FOR_VERSION_MISMATCH
;
const
int
DLIB_NO_WARN_UNUSED
dlib_check_for_version_mis
s
match
=
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
;
const
int
DLIB_NO_WARN_UNUSED
dlib_check_for_version_mismatch
=
DLIB_CHECK_FOR_VERSION_MISMATCH
;
#endif
#endif
}
}
...
...
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