mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Make/CMake: Fix use of compiler flags

Browse Source 
CMake: Option was not enabled by default as intended.
Makefile: Flags were not passed when building the tests
This commit is contained in:
Max Bruckner 2016-11-26 12:57:12 +07:00
parent d0a9f46888
commit 4703f01cf4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -12,7 +12,7 @@ set(CJSON_VERSION_SO 1)
set(CJSON_UTILS_VERSION_SO 1) set(CJSON_UTILS_VERSION_SO 1)
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
option(ENABLE_CUSTOM_COMPILER_FLAGS ON) option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags for Clang and GCC" ON)
if (ENABLE_CUSTOM_COMPILER_FLAGS) if (ENABLE_CUSTOM_COMPILER_FLAGS)
if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")) if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang"))
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings")

6
Makefile
View File

@ -62,15 +62,15 @@ test: tests
./$(UTILS_TEST) ./$(UTILS_TEST)
.c.o: .c.o:
$(CC) -ansi -pedantic -c $(R_CFLAGS) $< $(CC) -c $(R_CFLAGS) $<
#tests #tests
#cJSON #cJSON
$(CJSON_TEST): cJSON.c cJSON.h test.c $(CJSON_TEST): cJSON.c cJSON.h test.c
$(CC) $^ -o $@ $(LDLIBS) -I. $(CC) $(R_CFLAGS) $^ -o $@ $(LDLIBS) -I.
#cJSON_Utils #cJSON_Utils
$(UTILS_TEST): cJSON.c cJSON.h test.c $(UTILS_TEST): cJSON.c cJSON.h test.c
$(CC) $^ -o $@ $(LDLIBS) -I. $(CC) $(R_CFLAGS) $^ -o $@ $(LDLIBS) -I.
#static libraries #static libraries
#cJSON #cJSON