OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed CMake so it doesn't automatically enable asserts in debug builds since 

this frustrates Visual Studio users who want to compile dlib as a static
library.
This commit is contained in:
Davis King 2016-11-04 20:30:03 -04:00
parent bf94ce6f4e
commit cccde6324c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlib/CMakeLists.txt
View File

@ -33,12 +33,18 @@ endif()
include(cmake_utils/add_global_compiler_switch.cmake) include(cmake_utils/add_global_compiler_switch.cmake)
# Make sure ENABLE_ASSERTS is defined for debug builds if (DLIB_IN_PROJECT_BUILD)
# Make sure ENABLE_ASSERTS is defined for debug builds, but only for uses
# who are building an application. If they are just building dlib as a
# stand alone library then don't set this because it will conflict with the
# settings in config.h if we did.
if (NOT CMAKE_CXX_FLAGS_DEBUG MATCHES "-DENABLE_ASSERTS") if (NOT CMAKE_CXX_FLAGS_DEBUG MATCHES "-DENABLE_ASSERTS")
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_ASSERTS" set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_ASSERTS"
CACHE STRING "Flags used by the compiler during C++ debug builds." CACHE STRING "Flags used by the compiler during C++ debug builds."
FORCE) FORCE)
endif() endif()
endif()
macro (toggle_preprocessor_switch option_name) macro (toggle_preprocessor_switch option_name)
if (${option_name}) if (${option_name})
add_global_define(${option_name}) add_global_define(${option_name})