Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: cmake/RequireDWCAS.cmake
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- diff --git a/cmake/RequireDWCAS.cmake b/cmake/RequireDWCAS.cmake
- --- a/cmake/RequireDWCAS.cmake (revision 1fce2a5c44f904acc62ee6bfec54ad9fccd5f0ae)
- +++ b/cmake/RequireDWCAS.cmake (date 1663662652839)
- @@ -11,11 +11,10 @@
- return()
- endif()
- -set(BOOST_CMAKE_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- set(TEST_DEFINITIONS)
- set(TEST_LIBRARIES)
- -if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND "${BOOST_CMAKE_VERSION}" VERSION_GREATER_EQUAL "1.66")
- +if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND "${BOOST_VERSION}" VERSION_GREATER_EQUAL "1.66")
- # Clang's std::atomic already emits DWCAS instructions for x86,
- # x86_64 and armv8-a (a.k.a. ARM64) architectures (both libstdc++ and libc++).
- #
- @@ -26,6 +25,7 @@
- # and ARM64 (Boost 1.74+) architectures.
- add_compile_definitions(USERVER_USE_BOOST_DWCAS=1)
- list(APPEND TEST_DEFINITIONS "-DUSERVER_USE_BOOST_DWCAS=1")
- + message(STATUS "DWCAS: Using Boost.Atomic")
- endif()
- include(CheckCXXCompilerFlag)
- Index: CMakeLists.txt
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- --- a/CMakeLists.txt (revision 1fce2a5c44f904acc62ee6bfec54ad9fccd5f0ae)
- +++ b/CMakeLists.txt (date 1663665317373)
- @@ -1,5 +1,6 @@
- -cmake_minimum_required(VERSION 3.12)
- +cmake_minimum_required(VERSION 3.15)
- cmake_policy(SET CMP0025 NEW)
- +cmake_policy(SET CMP0093 NEW)
- project(userver)
- set(USERVER_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
- Index: cmake/SetupEnvironment.cmake
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- diff --git a/cmake/SetupEnvironment.cmake b/cmake/SetupEnvironment.cmake
- --- a/cmake/SetupEnvironment.cmake (revision 1fce2a5c44f904acc62ee6bfec54ad9fccd5f0ae)
- +++ b/cmake/SetupEnvironment.cmake (date 1663665209956)
- @@ -113,8 +113,8 @@
- add_compile_options("-Wno-range-loop-analysis")
- endif()
- -if (CLANG)
- - message (STATUS "boost: ${Boost_VERSION}")
- +message (STATUS "boost: ${Boost_VERSION}")
- +if (CLANG)
- if (MACOS AND Boost_FOUND)
- # requires Boost_FOUND to make a valid expression
- if (${Boost_VERSION} VERSION_LESS "1.68")
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement