Ver Fonte

Make/CMake: Fix use of compiler flags

CMake: Option was not enabled by default as intended.
Makefile: Flags were not passed when building the tests
Max Bruckner há 8 anos atrás
pai
commit
4703f01cf4
2 ficheiros alterados com 4 adições e 4 exclusões
  1. 1 1
      CMakeLists.txt
  2. 3 3
      Makefile

+ 1 - 1
CMakeLists.txt

@@ -12,7 +12,7 @@ set(CJSON_VERSION_SO 1)
 set(CJSON_UTILS_VERSION_SO 1)
 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(("${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")

+ 3 - 3
Makefile

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