Commit f8adfbfd authored by Davis King's avatar Davis King

Fixed spelling and improved error message.

parent 2f81256f
......@@ -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_MISSMATCH
DLIB_VERSION_CHECK_${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH})
target_compile_options(dlib PRIVATE "-DDLIB_CHECK_FOR_VERSION_MISSMATCH=${DLIB_CHECK_FOR_VERSION_MISSMATCH}")
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_MISMATCH=${DLIB_CHECK_FOR_VERSION_MISMATCH}")
endif()
......
......@@ -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_MISSMATCH @DLIB_CHECK_FOR_VERSION_MISSMATCH@
#cmakedefine DLIB_CHECK_FOR_VERSION_MISMATCH @DLIB_CHECK_FOR_VERSION_MISMATCH@
......@@ -36,8 +36,8 @@ extern "C"
#ifdef DLIB_CHECK_FOR_VERSION_MISSMATCH
const int DLIB_CHECK_FOR_VERSION_MISSMATCH = 0;
#ifdef DLIB_CHECK_FOR_VERSION_MISMATCH
const int DLIB_CHECK_FOR_VERSION_MISMATCH = 0;
#endif
}
......
......@@ -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_MISSMATCH
const extern int DLIB_CHECK_FOR_VERSION_MISSMATCH;
const int DLIB_NO_WARN_UNUSED dlib_check_for_version_missmatch = DLIB_CHECK_FOR_VERSION_MISSMATCH;
#ifdef DLIB_CHECK_FOR_VERSION_MISMATCH
const extern int DLIB_CHECK_FOR_VERSION_MISMATCH;
const int DLIB_NO_WARN_UNUSED dlib_check_for_version_mismatch = DLIB_CHECK_FOR_VERSION_MISMATCH;
#endif
}
......
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