diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-27 16:07:07 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-27 16:07:07 -0800 |
| commit | c835db39e8c3201383a1e0e3b5dcea41afd68165 (patch) | |
| tree | ec5d1d45a1400d1f59ffdccb61b29e4466d4b8e7 | |
| parent | 5c9c1bde53f562c11a5248090ad2c63e7e481633 (diff) | |
| download | vcpkg-c835db39e8c3201383a1e0e3b5dcea41afd68165.tar.gz vcpkg-c835db39e8c3201383a1e0e3b5dcea41afd68165.zip | |
[dlib] Fix assert configuration issue in release mode
| -rw-r--r-- | ports/dlib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/dlib/portfile.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index b23776ff5..d711849f0 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,5 +1,5 @@ Source: dlib -Version: 19.9 +Version: 19.9-1 Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index fc63f494a..cf3ae4079 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -61,8 +61,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm) # Dlib encodes debug/release in its config.h. Patch it to respond to the NDEBUG macro instead. file(READ ${CURRENT_PACKAGES_DIR}/include/dlib/config.h _contents) -string(REPLACE "/* #undef ENABLE_ASSERTS */" "#if !defined(NDEBUG)\n#define ENABLE_ASSERTS\n#endif" _contents ${_contents}) -string(REPLACE "#define DLIB_DISABLE_ASSERTS" "#if defined(NDEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif" _contents ${_contents}) +string(REPLACE "/* #undef ENABLE_ASSERTS */" "#if defined(_DEBUG)\n#define ENABLE_ASSERTS\n#endif" _contents ${_contents}) +string(REPLACE "#define DLIB_DISABLE_ASSERTS" "#if !defined(_DEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif" _contents ${_contents}) file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h ${_contents}) file(READ ${CURRENT_PACKAGES_DIR}/share/dlib/dlib.cmake _contents) |