projects
/
libam7xxx.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
am7xxx: improve setting USB configuration and interface_number
[libam7xxx.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
3e525cc
..
89f0437
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
2
)
+set(PROJECT_VER_PATCH
3
)
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}")
@@
-48,7
+48,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,13
+67,13
@@
if (CMAKE_COMPILER_IS_GNUCC)
-Wwrite-strings
-fstack-protector
--param=ssp-buffer-size=4)
-Wwrite-strings
-fstack-protector
--param=ssp-buffer-size=4)
-endif()
-set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -DDEBUG=1")
-set(CMAKE_C_FLAGS_RELEASE "-O2")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+ add_flags(DEBUG_FLAGS
+ -ggdb)
+
+ add_flags(RELEASE_FLAGS
+ -Wp,-D_FORTIFY_SOURCE=2)
-if (CMAKE_COMPILER_IS_GNUCC)
if (STRICT_COMPILATION_CHECKS)
add_flags(STRICT_FLAGS
-Werror
if (STRICT_COMPILATION_CHECKS)
add_flags(STRICT_FLAGS
-Werror
@@
-83,12
+82,13
@@
if (CMAKE_COMPILER_IS_GNUCC)
# 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)
- add_flags(CMAKE_C_FLAGS_DEBUG ${STRICT_FLAGS})
- add_flags(CMAKE_C_FLAGS_RELEASE ${STRICT_FLAGS})
- add_flags(CMAKE_C_FLAGS_RELWITHDEBINFO ${STRICT_FLAGS})
endif()
endif()
endif()
endif()
+set(CMAKE_C_FLAGS_DEBUG "-O0 ${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_subdirectory(examples)
# Add library project
add_subdirectory(src)
add_subdirectory(examples)