Skip to content

Commit

Permalink
CMake: Support cmake down to 2.8.5
Browse files Browse the repository at this point in the history
  • Loading branch information
FSMaxB committed Mar 16, 2017
1 parent 76e5296 commit 30e1e7a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.5)

include(GNUInstallDirs)

Expand Down Expand Up @@ -172,7 +172,11 @@ if(ENABLE_CJSON_TEST)

# Disable -fsanitize=float-divide-by-zero for cJSON_test
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()

if(ENABLE_CJSON_UTILS)
Expand Down
12 changes: 10 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@ if(ENABLE_CJSON_TEST)

# Disable -Werror for Unity
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()
# Disable -fvisibility=hidden for Unity
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()

#copy test files
Expand Down

0 comments on commit 30e1e7a

Please sign in to comment.