From ad341810c4df70a298fceccd4e93d7352aac2b7e Mon Sep 17 00:00:00 2001 From: Davis King Date: Sat, 24 Sep 2011 00:11:14 -0400 Subject: [PATCH] Increased usability of the dlib CMakeLists.txt file slightly. --- dlib/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt index 737678fea..9edb283d4 100644 --- a/dlib/CMakeLists.txt +++ b/dlib/CMakeLists.txt @@ -199,6 +199,8 @@ if (NOT DLIB_ISO_CPP_ONLY) get_filename_component(sqlite_path2 ${sqlite_path} PATH CACHE) include_directories(${sqlite_path2}) set(dlib_needed_libraries ${dlib_needed_libraries} ${sqlite} ) + else() + set(DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING ${DLIB_LINK_WITH_SQLITE3_STR} FORCE ) endif() mark_as_advanced(sqlite sqlite_path sqlite_path2) endif() @@ -214,13 +216,13 @@ include(TestForSTDNamespace) include(TestForANSIStreamHeaders) -if (DLIB_LINK_WITH_LIBPNG) +if (DLIB_LINK_WITH_LIBPNG AND NOT DLIB_ISO_CPP_ONLY) add_global_define(DLIB_PNG_SUPPORT) else() remove_global_define(DLIB_PNG_SUPPORT) endif() -if (DLIB_LINK_WITH_LIBJPEG) +if (DLIB_LINK_WITH_LIBJPEG AND NOT DLIB_ISO_CPP_ONLY) add_global_define(DLIB_JPEG_SUPPORT) else() remove_global_define(DLIB_JPEG_SUPPORT)