mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

CMake: Support cmake down to 2.8.5

Browse Source
This commit is contained in:
Max Bruckner 2017-03-16 01:09:26 +01:00
parent 76e5296d0d
commit 30e1e7af7c
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0) set(CMAKE_LEGACY_CYGWIN_WIN32 0)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8.5)
include(GNUInstallDirs) include(GNUInstallDirs)
@ -172,7 +172,11 @@ if(ENABLE_CJSON_TEST)
# Disable -fsanitize=float-divide-by-zero for cJSON_test # Disable -fsanitize=float-divide-by-zero for cJSON_test
if (FLAG_SUPPORTED_fsanitizefloatdividebyzero) if (FLAG_SUPPORTED_fsanitizefloatdividebyzero)
target_compile_options(${TEST_CJSON} PRIVATE "-fno-sanitize=float-divide-by-zero") if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-sanitize=float-divide-by-zero")
else()
target_compile_options(${TEST_CJSON} PRIVATE "-fno-sanitize=float-divide-by-zero")
endif()
endif() endif()
if(ENABLE_CJSON_UTILS) if(ENABLE_CJSON_UTILS)

12
tests/CMakeLists.txt
View File

@ -3,11 +3,19 @@ if(ENABLE_CJSON_TEST)
# Disable -Werror for Unity # Disable -Werror for Unity
if (FLAG_SUPPORTED_Werror) if (FLAG_SUPPORTED_Werror)
target_compile_options(unity PRIVATE "-Wno-error") if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
else()
target_compile_options(unity PRIVATE "-Wno-error")
endif()
endif() endif()
# Disable -fvisibility=hidden for Unity # Disable -fvisibility=hidden for Unity
if (FLAG_SUPPORTED_fvisibilityhidden) if (FLAG_SUPPORTED_fvisibilityhidden)
target_compile_options(unity PRIVATE "-fvisibility=default") if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default")
else()
target_compile_options(unity PRIVATE "-fvisibility=default")
endif()
endif() endif()
#copy test files #copy test files