improved compiling checks

DavidNegro · Aug 6, 2018 · 2e5216b · 2e5216b
1 parent 3c3962c
commit 2e5216b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2015-2015 Oleg Alexeenkov
-# Copyright (C) 2015-2017 Felix Weinrank
+# Copyright (C) 2015-2018 Felix Weinrank
 #
 # All rights reserved.
 #
@@ -236,12 +236,25 @@ endif ()
 # SETTINGS FOR VISUAL STUDIO COMPILER
 if (CMAKE_C_COMPILER_ID MATCHES "MSVC")
 	if (CMAKE_C_FLAGS MATCHES "/W[0-4]")
-		string(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 	else ()
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
 	endif ()
 
-	if (WERROR)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4100") # 'identifier' : unreferenced formal parameter
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127") # conditional expression is constant
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4200") # nonstandard extension used : zero-sized array in struct/union
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4214") # bit field types other than int
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4706") # assignment within conditional expression
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4245") # 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4389") # 'operator' : signed/unsigned mismatch
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4702") # unreachable code
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4701") # Potentially uninitialized local variable 'name' used
+
+	# ToDo
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244") # 'conversion' conversion from 'type1' to 'type2', possible loss of data
+
+	if (sctp_werror)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 	endif ()
 endif ()

diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
@@ -48,11 +48,11 @@ include_directories(${CMAKE_SOURCE_DIR}/usrsctplib)
 # OS DEPENDENT
 #################################################
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 	add_definitions(-D_GNU_SOURCE)
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	add_definitions(-D__APPLE_USE_RFC_2292)
 endif ()
 
@@ -99,7 +99,8 @@ foreach (source_file ${check_programs})
 		${source_file}
 	)
 
-	target_link_libraries(${source_file_we}
+	target_link_libraries(
+		${source_file_we}
 		${programs_link_library}
 		${CMAKE_THREAD_LIBS_INIT}
 	)

diff --git a/programs/rtcweb.c b/programs/rtcweb.c
@@ -119,6 +119,8 @@ struct peer_connection {
 #define SCTP_PACKED
 #endif
 
+#pragma warning( push )
+#pragma warning( disable : 4200 )
 struct rtcweb_datachannel_open_request {
 	uint8_t msg_type; /* DATA_CHANNEL_OPEN_REQUEST */
 	uint8_t channel_type;
@@ -127,6 +129,7 @@ struct rtcweb_datachannel_open_request {
 	int16_t priority;
 	char label[];
 } SCTP_PACKED;
+#pragma warning( pop )
 
 struct rtcweb_datachannel_open_response {
 	uint8_t  msg_type; /* DATA_CHANNEL_OPEN_RESPONSE */

diff --git a/usrsctplib/CMakeLists.txt b/usrsctplib/CMakeLists.txt
@@ -53,32 +53,32 @@ add_definitions(-DSCTP_PROCESS_LEVEL_LOCKS)
 # OS DEPENDENT
 #################################################
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 	add_definitions(-D_GNU_SOURCE)
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 	add_definitions(-U__FreeBSD__)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -Wno-address-of-packed-member")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-address-of-packed-member")
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	add_definitions(-U__APPLE__)
 	add_definitions(-D__APPLE_USE_RFC_2292)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -Wno-address-of-packed-member -Wno-deprecated-declarations")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-address-of-packed-member -Wno-deprecated-declarations")
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+if (CMAKE_SYSTEM_NAME MATCHES "DragonFly")
 	add_definitions(-U__DragonFly__)
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
 	add_definitions(-U__NetBSD__)
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
 	add_definitions(-U__OpenBSD__)
 endif ()