Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dlib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
dlib
Commits
f8adfbfd
Commit
f8adfbfd
authored
Mar 01, 2018
by
Davis King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed spelling and improved error message.
parent
2f81256f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
CMakeLists.txt
dlib/CMakeLists.txt
+3
-3
config.h.in
dlib/config.h.in
+1
-1
test_for_odr_violations.cpp
dlib/test_for_odr_violations.cpp
+2
-2
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)
# 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
# the wrong version.
set
(
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
DLIB_VERSION_
CHECK
_
${
CPACK_PACKAGE_VERSION_MAJOR
}
_
${
CPACK_PACKAGE_VERSION_MINOR
}
_
${
CPACK_PACKAGE_VERSION_PATCH
}
)
target_compile_options
(
dlib PRIVATE
"-DDLIB_CHECK_FOR_VERSION_MIS
SMATCH=
${
DLIB_CHECK_FOR_VERSION_MIS
SMATCH
}
"
)
set
(
DLIB_CHECK_FOR_VERSION_MISMATCH
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
MATCH=
${
DLIB_CHECK_FOR_VERSION_MI
SMATCH
}
"
)
endif
()
...
...
dlib/config.h.in
View file @
f8adfbfd
...
...
@@ -30,5 +30,5 @@
// 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.
#cmakedefine DLIB_CHECK_FOR_VERSION_MIS
SMATCH @DLIB_CHECK_FOR_VERSION_MIS
SMATCH@
#cmakedefine DLIB_CHECK_FOR_VERSION_MIS
MATCH @DLIB_CHECK_FOR_VERSION_MI
SMATCH@
dlib/test_for_odr_violations.cpp
View file @
f8adfbfd
...
...
@@ -36,8 +36,8 @@ extern "C"
#ifdef DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
const
int
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
=
0
;
#ifdef DLIB_CHECK_FOR_VERSION_MISMATCH
const
int
DLIB_CHECK_FOR_VERSION_MISMATCH
=
0
;
#endif
}
...
...
dlib/test_for_odr_violations.h
View file @
f8adfbfd
...
...
@@ -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
// dlib with the compiled binary from a different version of dlib.
#ifdef DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
const
extern
int
DLIB_CHECK_FOR_VERSION_MIS
S
MATCH
;
const
int
DLIB_NO_WARN_UNUSED
dlib_check_for_version_mis
smatch
=
DLIB_CHECK_FOR_VERSION_MIS
SMATCH
;
#ifdef DLIB_CHECK_FOR_VERSION_MISMATCH
const
extern
int
DLIB_CHECK_FOR_VERSION_MISMATCH
;
const
int
DLIB_NO_WARN_UNUSED
dlib_check_for_version_mis
match
=
DLIB_CHECK_FOR_VERSION_MI
SMATCH
;
#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