diff options
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bf0354daee..1b3fa77c06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) +cmake_policy(SET CMP0054 NEW) + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) message("${CMAKE_MODULE_PATH}") @@ -12,8 +14,8 @@ option(HUNTER_ENABLED "Enable hunter package pulling" OFF) #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti") include("cmake/HunterGate.cmake") HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.18.44.tar.gz" - SHA1 "a78f0b377b8e53c038f12fc18b0c02564c4534c8" + URL "https://github.com/ruslo/hunter/archive/v0.18.64.tar.gz" + SHA1 "baf9c8cc4f65306f0e442b5419967b4c4c04589a" ) project(bmc-webserver CXX C) @@ -23,9 +25,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks") - if (MSAN) if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") message(FATAL_ERROR "Cannot enable MSAN unless using Clang") @@ -258,4 +257,4 @@ target_link_libraries(getvideo g3logger) # this needs to be at the end to make sure all includes are handled correctly get_property(C_INCLUDE_DIRS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) -execute_process(COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/prime_vscode_compile_db.py ${C_INCLUDE_DIRS})
\ No newline at end of file +execute_process(COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/prime_vscode_compile_db.py ${C_INCLUDE_DIRS}) |