mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-09 23:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

modify json-c default build type, and fix up the assert() errors in testcase

Browse Source
This commit is contained in:
dota17
2020-02-29 15:32:42 +08:00
parent 30e00cf757
commit 2d44f865c3
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -19,6 +19,11 @@ if(POLICY CMP0054)
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
endif() endif()
# set default build type if not specified by user
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE debug)
endif()
# Include file check macros honor CMAKE_REQUIRED_LIBRARIES # Include file check macros honor CMAKE_REQUIRED_LIBRARIES
# i.e. the check_include_file() calls will include -lm when checking. # i.e. the check_include_file() calls will include -lm when checking.
if(POLICY CMP0075) if(POLICY CMP0075)
@@ -238,6 +243,9 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4701") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4701")
endif() endif()
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
set(CMAKE_C_FLAGS_Release "${CMAKE_C_FLAGS_Release} -O2")
if (NOT ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")) if (NOT ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC"))
check_c_source_compiles( check_c_source_compiles(
[=[ [=[

5
tests/CMakeLists.txt
View File

@@ -52,8 +52,3 @@ target_link_libraries(
endforeach(TESTNAME) endforeach(TESTNAME)
# Make sure NDEBUG is always undefined for tests
if (UNIX OR MINGW OR CYGWIN)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -UNDEBUG")
endif()

5
tests/test_deep_copy.c
View File

@@ -2,7 +2,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#ifdef NDEBUG
#undef NDEBUG
#include <assert.h> #include <assert.h>
#else
#include <assert.h>
#endif
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>

5
tests/test_json_pointer.c
View File

@@ -1,6 +1,11 @@
#include "strerror_override.h" #include "strerror_override.h"
#include "strerror_override_private.h" #include "strerror_override_private.h"
#ifdef NDEBUG
#undef NDEBUG
#include <assert.h> #include <assert.h>
#else
#include <assert.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>