debian/watch: update version to 4

[libam7xxx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7db3067..cb1272c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,17 +5,19 @@ set(PROJECT_DESCRIPTION
   "Communication library for Actions Micro AM7XXX based USB projectors and DPFs")
 
 set(PROJECT_VER_MAJOR 0)
   "Communication library for Actions Micro AM7XXX based USB projectors and DPFs")
 
 set(PROJECT_VER_MAJOR 0)

-set(PROJECT_VER_MINOR 0)
-set(PROJECT_VER_PATCH 1)
+set(PROJECT_VER_MINOR 1)
+set(PROJECT_VER_PATCH 5)

 set(PROJECT_VER_EXTRA "")
 set(PROJECT_VER
   "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}${PROJECT_VER_EXTRA}")
 set(PROJECT_APIVER
   "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}")
 
 set(PROJECT_VER_EXTRA "")
 set(PROJECT_VER
   "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}${PROJECT_VER_EXTRA}")
 set(PROJECT_APIVER
   "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}")
 

-set(CMAKE_MODULE_PATH 
+set(CMAKE_MODULE_PATH

   ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
 
   ${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)


@@ -29,22 +31,18 @@ macro(add_flags var)
   set(${var} "${${var}} ${_flags}")
 endmacro(add_flags)
 
   set(${var} "${${var}} ${_flags}")
 endmacro(add_flags)
 

-if (CMAKE_COMPILER_IS_GNUCC)
+string(REGEX MATCH "clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER}")
+
+if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)

   add_definitions(-Wall)
 
   # let CFLAGS env override this
   if(CMAKE_C_FLAGS STREQUAL "")
   add_definitions(-Wall)
 
   # let CFLAGS env override this
   if(CMAKE_C_FLAGS STREQUAL "")

-    set(CMAKE_C_FLAGS "-std=c99 -pedantic -Wall -Wextra -O2")
+    set(CMAKE_C_FLAGS "-std=c99 -pedantic -Wall -Wextra")

   endif()
 
   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
   add_flags(CMAKE_C_FLAGS

+    -fvisibility=hidden

     -fno-common
     -Wall
     -Wextra
     -fno-common
     -Wall
     -Wextra


@@ -52,7 +50,6 @@ if (CMAKE_COMPILER_IS_GNUCC)
     -Winit-self
     -Winline
     -Wpacked
     -Winit-self
     -Winline
     -Wpacked

-    -Wp,-D_FORTIFY_SOURCE=2

     -Wpointer-arith
     -Wlarger-than-65500
     -Wmissing-declarations
     -Wpointer-arith
     -Wlarger-than-65500
     -Wmissing-declarations


@@ -68,16 +65,50 @@ if (CMAKE_COMPILER_IS_GNUCC)
     -Wswitch-enum
     -Wundef
     -Wunreachable-code
     -Wswitch-enum
     -Wundef
     -Wunreachable-code

-    -Wunsafe-loop-optimizations

     -Wwrite-strings
     -Wwrite-strings

-    -fstack-protector
+    -fstack-protector)
+
+  add_flags(DEBUG_FLAGS
+    -ggdb)
+
+  add_flags(RELEASE_FLAGS
+    -Wp,-D_FORTIFY_SOURCE=2)
+
+  if (STRICT_COMPILATION_CHECKS)
+    add_flags(STRICT_FLAGS
+      -Werror
+      # sign conversion warnings can be very noisy for a very little gain
+      #-Wsign-conversion
+      # NOTE: Vanilla libusb-1.0.8 can't live with -pedantic-errors
+      -pedantic-errors)
+
+  endif()
+endif()
+
+if (CMAKE_COMPILER_IS_GNUCC)
+  add_flags(CMAKE_C_FLAGS
+    -Wunsafe-loop-optimizations

     --param=ssp-buffer-size=4)
     --param=ssp-buffer-size=4)

+
+  if (STRICT_COMPILATION_CHECKS)
+    add_flags(STRICT_FLAGS
+      # NOTE: GCC >= 4.6 is needed for -Wunused-but-set-variable
+      -Wunused-but-set-variable)
+  endif()
+endif()
+
+if (CMAKE_COMPILER_IS_CLANG)
+  if (STRICT_COMPILATION_CHECKS)
+    add_flags(STRICT_FLAGS
+      -Wshorten-64-to-32)
+  endif()

 endif()
 
 endif()
 

-set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG=1 -Werror")
-set(CMAKE_C_FLAGS_RELEASE "-O2")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG=1 ${DEBUG_FLAGS} ${STRICT_FLAGS}")
+set(CMAKE_C_FLAGS_RELEASE "-O2 ${RELEASE_FLAGS} ${STRICT_FLAGS}")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 ${RELEASE_FLAGS} ${DEBUG_FLAGS} ${STRICT_FLAGS}")

 
 # Add library project
 add_subdirectory(src)
 
 # Add library project
 add_subdirectory(src)

+add_subdirectory(examples)

 add_subdirectory(doc)
 add_subdirectory(doc)