projects
/
libam7xxx.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/{control,gbp.conf}: change the debian branch name to follow DEP-14
[libam7xxx.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
89f0437
..
cb1272c
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-6,7
+6,7
@@
set(PROJECT_DESCRIPTION
set(PROJECT_VER_MAJOR 0)
set(PROJECT_VER_MINOR 1)
set(PROJECT_VER_MAJOR 0)
set(PROJECT_VER_MINOR 1)
-set(PROJECT_VER_PATCH
3
)
+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_VER_EXTRA "")
set(PROJECT_VER
"${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}${PROJECT_VER_EXTRA}")
@@
-31,7
+31,9
@@
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
add_definitions(-Wall)
# let CFLAGS env override this
@@
-63,10
+65,8
@@
if (CMAKE_COMPILER_IS_GNUCC)
-Wswitch-enum
-Wundef
-Wunreachable-code
-Wswitch-enum
-Wundef
-Wunreachable-code
- -Wunsafe-loop-optimizations
-Wwrite-strings
-Wwrite-strings
- -fstack-protector
- --param=ssp-buffer-size=4)
+ -fstack-protector)
add_flags(DEBUG_FLAGS
-ggdb)
add_flags(DEBUG_FLAGS
-ggdb)
@@
-77,15
+77,34
@@
if (CMAKE_COMPILER_IS_GNUCC)
if (STRICT_COMPILATION_CHECKS)
add_flags(STRICT_FLAGS
-Werror
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
# 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)
# 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()
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}")
set(CMAKE_C_FLAGS_RELEASE "-O2 ${RELEASE_FLAGS} ${STRICT_FLAGS}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 ${RELEASE_FLAGS} ${DEBUG_FLAGS} ${STRICT_FLAGS}")