cmake: make stricter compilation checks conditional

On some systems building with options like -Werror is just impractical.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9950111..41cb527 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ set(PROJECT_APIVER
 set(CMAKE_MODULE_PATH 
   ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
 
 set(CMAKE_MODULE_PATH 
   ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
 

+OPTION(STRICT_COMPILATION_CHECKS "Enable stricter compilation checks" OFF)
+

 include (MaintenanceTools)
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 include (MaintenanceTools)
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)


@@ -37,13 +39,6 @@ if (CMAKE_COMPILER_IS_GNUCC)
     set(CMAKE_C_FLAGS "-std=c99 -pedantic -Wall -Wextra")
   endif()
 
     set(CMAKE_C_FLAGS "-std=c99 -pedantic -Wall -Wextra")
   endif()
 

-  # Don't make pedantic checks errors,
-  # as vanilla libusb-1.0.8 can't live with that
-  #add_flags(CMAKE_C_FLAGS -pedantic-errors)
-
-  # GCC >= 4.6
-  #add_flags(CMAKE_C_FLAGS -Wunused-but-set-variable)
-

   add_flags(CMAKE_C_FLAGS
     -fno-common
     -Wall
   add_flags(CMAKE_C_FLAGS
     -fno-common
     -Wall


@@ -72,9 +67,18 @@ if (CMAKE_COMPILER_IS_GNUCC)
     -Wwrite-strings
     -fstack-protector
     --param=ssp-buffer-size=4)
     -Wwrite-strings
     -fstack-protector
     --param=ssp-buffer-size=4)

+
+  if (STRICT_COMPILATION_CHECKS)
+    add_flags(CMAKE_C_FLAGS
+      -Werror
+      # NOTE: Vanilla libusb-1.0.8 can't live with -pedantic-errors
+      -pedantic-errors
+      # NOTE: GCC >= 4.6 is needed for -Wunused-but-set-variable
+      -Wunused-but-set-variable)
+  endif()

 endif()
 
 endif()
 

-set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -DDEBUG=1 -Werror")
+set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -DDEBUG=1")

 set(CMAKE_C_FLAGS_RELEASE "-O2")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
 
 set(CMAKE_C_FLAGS_RELEASE "-O2")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
 

diff --git a/HACKING.asciidoc b/HACKING.asciidoc
index cd9486d..99dc15e 100644 (file)
--- a/HACKING.asciidoc
+++ b/HACKING.asciidoc
@@ -11,7 +11,7 @@ The suggested way to hack on the project is:
 
   $ mkdir build
   $ cd build
 
   $ mkdir build
   $ cd build

-  $ cmake ../ -DCMAKE_BUILD_TYPE=debug
+  $ cmake ../ -DCMAKE_BUILD_TYPE=debug -DSTRICT_COMPILATION_CHECKS=ON

   $ make
 
 If you want to check the code with the ''sparse'' static analysis tool you
   $ make
 
 If you want to check the code with the ''sparse'' static analysis tool you