X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/3245aa702260b7ca45cef26622d9a90f6e602506..4b9cb6f91e33097c13b4dfa1b6f56a9510169c2a:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8264845..f234866 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 project(libam7xxx C)
 
+include (GNUInstallDirs)
+
 set(PROJECT_DESCRIPTION
   "Communication library for Actions Micro AM7XXX based USB projectors and DPFs")
 
 set(PROJECT_VER_MAJOR 0)
 set(PROJECT_VER_MINOR 1)
-set(PROJECT_VER_PATCH 3)
+set(PROJECT_VER_PATCH 7)
 set(PROJECT_VER_EXTRA "")
 set(PROJECT_VER
   "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}${PROJECT_VER_EXTRA}")
@@ -31,7 +33,9 @@ macro(add_flags var)
   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
@@ -63,14 +67,18 @@ if (CMAKE_COMPILER_IS_GNUCC)
     -Wswitch-enum
     -Wundef
     -Wunreachable-code
-    -Wunsafe-loop-optimizations
-    -Wwrite-strings
-    -fstack-protector
-    --param=ssp-buffer-size=4)
+    -Wwrite-strings)
+
+  include(CheckCCompilerFlag)
+  CHECK_C_COMPILER_FLAG(-fstack-protector-strong COMPILER_SUPPORTS_STACK_PROTECTOR_STRONG)
+  if (COMPILER_SUPPORTS_STACK_PROTECTOR_STRONG)
+    add_flags(CMAKE_C_FLAGS -fstack-protector-strong)
+  else()
+    add_flags(CMAKE_C_FLAGS -fstack-protector)
+  endif()
 
   add_flags(DEBUG_FLAGS
-    -ggdb
-    -DDEBUG=1)
+    -ggdb)
 
   add_flags(RELEASE_FLAGS
     -Wp,-D_FORTIFY_SOURCE=2)
@@ -78,15 +86,34 @@ if (CMAKE_COMPILER_IS_GNUCC)
   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
+      -pedantic-errors)
+
+  endif()
+endif()
+
+if (CMAKE_COMPILER_IS_GNUCC)
+  add_flags(CMAKE_C_FLAGS
+    -Wunsafe-loop-optimizations
+    --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()
 
-set(CMAKE_C_FLAGS_DEBUG "-O0 ${DEBUG_FLAGS} ${STRICT_FLAGS}")
+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}")