projects
/
libam7xxx.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/control: add Rules-Requires-Root: no
[libam7xxx.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
d908f1c
..
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}")
@@
-69,8
+69,7
@@
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
-fstack-protector)
add_flags(DEBUG_FLAGS
-fstack-protector)
add_flags(DEBUG_FLAGS
- -ggdb
- -DDEBUG=1)
+ -ggdb)
add_flags(RELEASE_FLAGS
-Wp,-D_FORTIFY_SOURCE=2)
add_flags(RELEASE_FLAGS
-Wp,-D_FORTIFY_SOURCE=2)
@@
-78,6
+77,8
@@
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
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
-pedantic-errors)
# NOTE: Vanilla libusb-1.0.8 can't live with -pedantic-errors
-pedantic-errors)
@@
-96,7
+97,14
@@
if (CMAKE_COMPILER_IS_GNUCC)
endif()
endif()
endif()
endif()
-set(CMAKE_C_FLAGS_DEBUG "-O0 ${DEBUG_FLAGS} ${STRICT_FLAGS}")
+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 -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}")