projects
/
libam7xxx.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define le32toh as letoh32 on the Android platform.
[libam7xxx.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
75b7b7c
..
3e525cc
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-6,14
+6,14
@@
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
0
)
+set(PROJECT_VER_PATCH
2
)
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/")
OPTION(STRICT_COMPILATION_CHECKS "Enable stricter compilation checks" OFF)
${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
OPTION(STRICT_COMPILATION_CHECKS "Enable stricter compilation checks" OFF)
@@
-40,6
+40,7
@@
if (CMAKE_COMPILER_IS_GNUCC)
endif()
add_flags(CMAKE_C_FLAGS
endif()
add_flags(CMAKE_C_FLAGS
+ -fvisibility=hidden
-fno-common
-Wall
-Wextra
-fno-common
-Wall
-Wextra
@@
-67,21
+68,27
@@
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")
+if (CMAKE_COMPILER_IS_GNUCC)
if (STRICT_COMPILATION_CHECKS)
if (STRICT_COMPILATION_CHECKS)
- add_flags(
CMAKE_C
_FLAGS
+ add_flags(
STRICT
_FLAGS
-Werror
# NOTE: Vanilla libusb-1.0.8 can't live with -pedantic-errors
-pedantic-errors
# NOTE: GCC >= 4.6 is needed for -Wunused-but-set-variable
-Wunused-but-set-variable)
-Werror
# NOTE: Vanilla libusb-1.0.8 can't live with -pedantic-errors
-pedantic-errors
# 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 -ggdb -DDEBUG=1")
-set(CMAKE_C_FLAGS_RELEASE "-O2")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
-
# Add library project
add_subdirectory(src)
add_subdirectory(examples)
# Add library project
add_subdirectory(src)
add_subdirectory(examples)