fix conflict

Author: fdr400

CMakeLists.txt

@@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.8...4.20)
 
 project(boost_stacktrace VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
-<<<<<<< HEAD
 function(stacktrace_add_module name)
   target_sources(${name}
     PUBLIC
@@ -20,9 +19,6 @@ function(stacktrace_add_module name)
 endfunction()
 
 function(stacktrace_add_library suffix opt public_libs libs defs add_module)
-=======
-function(stacktrace_add_library suffix opt public_libs libs defs)
->>>>>>> develop
 
   if(NOT opt)
     return()
@@ -51,14 +47,6 @@ function(stacktrace_add_library suffix opt public_libs libs defs)
       BOOST_STACKTRACE_NO_LIB
     PRIVATE
       ${defs}
-<<<<<<< HEAD
-=======
-  )
-
-  target_sources(boost_stacktrace_${suffix}
-    PRIVATE
-      ${CMAKE_CURRENT_LIST_DIR}/src/${suffix}.cpp
->>>>>>> develop
   )
 
   if (add_module)
@@ -137,7 +125,6 @@ if(BOOST_STACKTRACE_ENABLE_BACKTRACE OR
    BOOST_STACKTRACE_ENABLE_WINDBG_CACHED
   )
   set(_enable_non_noop_backend TRUE)
-<<<<<<< HEAD
 else()
   set(_enable_non_noop_backend FALSE)
 endif()
@@ -196,50 +183,6 @@ target_link_libraries(boost_stacktrace ${__scope} Boost::stacktrace_${__default_
 # Boost::stacktrace_from_exception is never the default
 if(_enable_non_noop_backend)
   stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} Boost::stacktrace_dump "${CMAKE_DL_LIBS}" "" FALSE)
-=======
-endif()
-
-if(_enable_non_noop_backend)
-  stacktrace_add_library(dump ON "" "" "")
-endif()
-stacktrace_add_library(noop ${BOOST_STACKTRACE_ENABLE_NOOP} "" "" "")
-stacktrace_add_library(backtrace ${BOOST_STACKTRACE_ENABLE_BACKTRACE} Boost::stacktrace_dump "backtrace;${CMAKE_DL_LIBS}" "")
-stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} Boost::stacktrace_dump "${CMAKE_DL_LIBS}" "")
-stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} Boost::stacktrace_dump "${CMAKE_DL_LIBS}" "")
-stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} Boost::stacktrace_dump "dbgeng;ole32" "_GNU_SOURCE=1")
-stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} Boost::stacktrace_dump "dbgeng;ole32" "_GNU_SOURCE=1")
-
-# boost_stacktrace, default library
-
-add_library(boost_stacktrace INTERFACE)
-
-target_include_directories(boost_stacktrace INTERFACE include)
-
-add_library(Boost::stacktrace ALIAS boost_stacktrace)
-
-if(BOOST_STACKTRACE_ENABLE_WINDBG)
-  set(__default_stacktrace_backend "windbg")
-elseif(BOOST_STACKTRACE_ENABLE_WINDBG_CACHED)
-  set(__default_stacktrace_backend "windbg_cached")
-elseif(BOOST_STACKTRACE_ENABLE_BACKTRACE)
-  set(__default_stacktrace_backend "backtrace")
-elseif(BOOST_STACKTRACE_ENABLE_ADDR2LINE)
-  set(__default_stacktrace_backend "addr2line")
-elseif(BOOST_STACKTRACE_ENABLE_BASIC)
-  set(__default_stacktrace_backend "basic")
-elseif(BOOST_STACKTRACE_ENABLE_NOOP)
-  set(__default_stacktrace_backend "noop")
-else()
-  message(FATAL "All backends are disabled")
-endif()
-
-message(STATUS "Boost.stacktrace default backend: ${__default_stacktrace_backend}")
-target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_${__default_stacktrace_backend})
-
-# Boost::stacktrace_from_exception is never the default
-if(_enable_non_noop_backend)
-  stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} Boost::stacktrace_dump "${CMAKE_DL_LIBS}" "")
->>>>>>> develop
   unset(_enable_non_noop_backend)
 endif()