Advertisement
AntonyZhilin

Untitled

Sep 20th, 2022
128
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.51 KB | None | 0 0
  1. Index: cmake/RequireDWCAS.cmake
  2. IDEA additional info:
  3. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  4. <+>UTF-8
  5. ===================================================================
  6. diff --git a/cmake/RequireDWCAS.cmake b/cmake/RequireDWCAS.cmake
  7. --- a/cmake/RequireDWCAS.cmake  (revision 1fce2a5c44f904acc62ee6bfec54ad9fccd5f0ae)
  8. +++ b/cmake/RequireDWCAS.cmake  (date 1663662652839)
  9. @@ -11,11 +11,10 @@
  10.    return()
  11.  endif()
  12.  
  13. -set(BOOST_CMAKE_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
  14.  set(TEST_DEFINITIONS)
  15.  set(TEST_LIBRARIES)
  16.  
  17. -if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND "${BOOST_CMAKE_VERSION}" VERSION_GREATER_EQUAL "1.66")
  18. +if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND "${BOOST_VERSION}" VERSION_GREATER_EQUAL "1.66")
  19.    # Clang's std::atomic already emits DWCAS instructions for x86,
  20.    # x86_64 and armv8-a (a.k.a. ARM64) architectures (both libstdc++ and libc++).
  21.    #
  22. @@ -26,6 +25,7 @@
  23.    # and ARM64 (Boost 1.74+) architectures.
  24.    add_compile_definitions(USERVER_USE_BOOST_DWCAS=1)
  25.    list(APPEND TEST_DEFINITIONS "-DUSERVER_USE_BOOST_DWCAS=1")
  26. +  message(STATUS "DWCAS: Using Boost.Atomic")
  27.  endif()
  28.  
  29.  include(CheckCXXCompilerFlag)
  30. Index: CMakeLists.txt
  31. IDEA additional info:
  32. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  33. <+>UTF-8
  34. ===================================================================
  35. diff --git a/CMakeLists.txt b/CMakeLists.txt
  36. --- a/CMakeLists.txt    (revision 1fce2a5c44f904acc62ee6bfec54ad9fccd5f0ae)
  37. +++ b/CMakeLists.txt    (date 1663665317373)
  38. @@ -1,5 +1,6 @@
  39. -cmake_minimum_required(VERSION 3.12)
  40. +cmake_minimum_required(VERSION 3.15)
  41.  cmake_policy(SET CMP0025 NEW)
  42. +cmake_policy(SET CMP0093 NEW)
  43.  project(userver)
  44.  
  45.  set(USERVER_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
  46. Index: cmake/SetupEnvironment.cmake
  47. IDEA additional info:
  48. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  49. <+>UTF-8
  50. ===================================================================
  51. diff --git a/cmake/SetupEnvironment.cmake b/cmake/SetupEnvironment.cmake
  52. --- a/cmake/SetupEnvironment.cmake  (revision 1fce2a5c44f904acc62ee6bfec54ad9fccd5f0ae)
  53. +++ b/cmake/SetupEnvironment.cmake  (date 1663665209956)
  54. @@ -113,8 +113,8 @@
  55.    add_compile_options("-Wno-range-loop-analysis")
  56.  endif()
  57.  
  58. -if (CLANG)
  59. -  message (STATUS "boost: ${Boost_VERSION}")
  60. +message (STATUS "boost: ${Boost_VERSION}")
  61. +if (CLANG)
  62.    if (MACOS AND Boost_FOUND)
  63.      # requires Boost_FOUND to make a valid expression
  64.      if (${Boost_VERSION} VERSION_LESS "1.68")
  65.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement