From 7a1b843553d5bd3b0c9acf753109d17bdc36e825 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 10:06:45 +0300 Subject: [PATCH 01/12] Fix stacktrace_from_exception builds --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2faafce..05a6851 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "${CMAKE_D stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "${CMAKE_DL_LIBS}" "") stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1") stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} "dbgeng;ole32" "_GNU_SOURCE=1") -stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "") +stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "BOOST_STACKTRACE_LINK=1") # boost_stacktrace, default library From 3718020f9b366b2a3928744b4a58bc4c839a04cc Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 10:22:42 +0300 Subject: [PATCH 02/12] fix attempt --- src/from_exception.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/from_exception.cpp b/src/from_exception.cpp index 7b8f937..f6cb39c 100644 --- a/src/from_exception.cpp +++ b/src/from_exception.cpp @@ -4,8 +4,6 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#define BOOST_STACKTRACE_INTERNAL_BUILD_LIBS - #if defined(_MSC_VER) #include From b60163773b089d438682f96165916c77ce13d871 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 10:33:16 +0300 Subject: [PATCH 03/12] fixes --- CMakeLists.txt | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a6851..cba50f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,31 +112,34 @@ add_library(Boost::stacktrace ALIAS boost_stacktrace) target_include_directories(boost_stacktrace INTERFACE include) +function(stacktrace_link_with_impl libs) + if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION) + target_link_libraries(Boost::stacktrace_from_exception PUBLIC ${libs}) + target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_from_exception) + else() + target_link_libraries(boost_stacktrace INTERFACE ${libs}) + endif() +endfunction() + if(BOOST_STACKTRACE_ENABLE_WINDBG) - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_windbg) + stacktrace_link_with_impl(Boost::stacktrace_windbg) elseif(BOOST_STACKTRACE_ENABLE_BACKTRACE) - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_backtrace) + stacktrace_link_with_impl(Boost::stacktrace_backtrace) elseif(BOOST_STACKTRACE_ENABLE_ADDR2LINE) - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_addr2line) + stacktrace_link_with_impl(Boost::stacktrace_addr2line) elseif(BOOST_STACKTRACE_ENABLE_BASIC) - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_basic) + stacktrace_link_with_impl(Boost::stacktrace_basic) elseif(BOOST_STACKTRACE_ENABLE_NOOP) - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_noop) - -endif() - -if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION) - - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_from_exception) + stacktrace_link_with_impl(Boost::stacktrace_noop) endif() From ec93d289f12509b53057f4f26b9711a3fa6dcfc3 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 10:43:49 +0300 Subject: [PATCH 04/12] fixes --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cba50f7..9e0e282 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,8 +114,8 @@ target_include_directories(boost_stacktrace INTERFACE include) function(stacktrace_link_with_impl libs) if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION) - target_link_libraries(Boost::stacktrace_from_exception PUBLIC ${libs}) - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_from_exception) + target_link_libraries(boost_stacktrace_from_exception PUBLIC ${libs}) + target_link_libraries(boost_stacktrace INTERFACE boost_stacktrace_from_exception ${libs}) else() target_link_libraries(boost_stacktrace INTERFACE ${libs}) endif() From 3b829ae10ec1ee4bb7a2508da414cbbde968ba2a Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:01:21 +0300 Subject: [PATCH 05/12] fixes --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e0e282..506d5b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "${CMAKE_D stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "${CMAKE_DL_LIBS}" "") stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1") stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} "dbgeng;ole32" "_GNU_SOURCE=1") -stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "BOOST_STACKTRACE_LINK=1") +stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "") # boost_stacktrace, default library @@ -143,6 +143,10 @@ elseif(BOOST_STACKTRACE_ENABLE_NOOP) endif() +if(BOOST_SUPERPROJECT_VERSION AND NOT CMAKE_VERSION VERSION_LESS 3.13) +boost_install(TARGETS boost_stacktrace VERSION ${BOOST_SUPERPROJECT_VERSION} HEADER_DIRECTORY include) +endif() + # if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt") From 5f4cb386c2a48d0f100fd708943a4d0dfee9e581 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:07:52 +0300 Subject: [PATCH 06/12] fix attempt --- CMakeLists.txt | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 506d5b9..4b91700 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,6 @@ stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "${CMAKE_D stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "${CMAKE_DL_LIBS}" "") stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1") stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} "dbgeng;ole32" "_GNU_SOURCE=1") -stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "") # boost_stacktrace, default library @@ -112,39 +111,24 @@ add_library(Boost::stacktrace ALIAS boost_stacktrace) target_include_directories(boost_stacktrace INTERFACE include) -function(stacktrace_link_with_impl libs) - if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION) - target_link_libraries(boost_stacktrace_from_exception PUBLIC ${libs}) - target_link_libraries(boost_stacktrace INTERFACE boost_stacktrace_from_exception ${libs}) - else() - target_link_libraries(boost_stacktrace INTERFACE ${libs}) - endif() -endfunction() - if(BOOST_STACKTRACE_ENABLE_WINDBG) - - stacktrace_link_with_impl(Boost::stacktrace_windbg) - + set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_windbg) elseif(BOOST_STACKTRACE_ENABLE_BACKTRACE) - - stacktrace_link_with_impl(Boost::stacktrace_backtrace) - + set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_backtrace) elseif(BOOST_STACKTRACE_ENABLE_ADDR2LINE) - - stacktrace_link_with_impl(Boost::stacktrace_addr2line) - + set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_addr2line) elseif(BOOST_STACKTRACE_ENABLE_BASIC) - - stacktrace_link_with_impl(Boost::stacktrace_basic) - + set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_basic) elseif(BOOST_STACKTRACE_ENABLE_NOOP) + set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_noop) +endif - stacktrace_link_with_impl(Boost::stacktrace_noop) - -endif() +stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} ${BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION}" "") -if(BOOST_SUPERPROJECT_VERSION AND NOT CMAKE_VERSION VERSION_LESS 3.13) -boost_install(TARGETS boost_stacktrace VERSION ${BOOST_SUPERPROJECT_VERSION} HEADER_DIRECTORY include) +if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION) + target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_from_exception) +else() + target_link_libraries(boost_stacktrace INTERFACE ${BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION}) endif() # From bcb985c25f1ab18314ec5761b9d32bc985f248d5 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:10:14 +0300 Subject: [PATCH 07/12] fix attempt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b91700..5dd3295 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ elseif(BOOST_STACKTRACE_ENABLE_BASIC) set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_basic) elseif(BOOST_STACKTRACE_ENABLE_NOOP) set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_noop) -endif +endif() stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} ${BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION}" "") From 34f33af26d3d64fe0536592034ff4ba0b061baa5 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:14:17 +0300 Subject: [PATCH 08/12] fix attempt --- CMakeLists.txt | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dd3295..c0e8773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,7 @@ stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "${CMAKE_D stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "${CMAKE_DL_LIBS}" "") stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1") stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} "dbgeng;ole32" "_GNU_SOURCE=1") +stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "") # boost_stacktrace, default library @@ -112,23 +113,25 @@ add_library(Boost::stacktrace ALIAS boost_stacktrace) target_include_directories(boost_stacktrace INTERFACE include) if(BOOST_STACKTRACE_ENABLE_WINDBG) - set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_windbg) + + target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_windbg) + elseif(BOOST_STACKTRACE_ENABLE_BACKTRACE) - set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_backtrace) + + target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_backtrace) + elseif(BOOST_STACKTRACE_ENABLE_ADDR2LINE) - set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_addr2line) + + target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_addr2line) + elseif(BOOST_STACKTRACE_ENABLE_BASIC) - set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_basic) + + target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_basic) + elseif(BOOST_STACKTRACE_ENABLE_NOOP) - set(BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION Boost::stacktrace_noop) -endif() -stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} ${BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION}" "") + target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_noop) -if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION) - target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_from_exception) -else() - target_link_libraries(boost_stacktrace INTERFACE ${BOOST_STACKTRACE_IMPL_DEFAULT_IMPLEMENTATION}) endif() # From 73863910fa9efd997be4d870f8998e72fcaf2b0b Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:16:19 +0300 Subject: [PATCH 09/12] fix attempt --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0e8773..1305295 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,6 @@ stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "${CMAKE_D stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "${CMAKE_DL_LIBS}" "") stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1") stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} "dbgeng;ole32" "_GNU_SOURCE=1") -stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "") # boost_stacktrace, default library @@ -134,6 +133,9 @@ elseif(BOOST_STACKTRACE_ENABLE_NOOP) endif() +# Boost::stacktrace_from exception is not linked by default +stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} boost_stacktrace" "") + # if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt") From f8f3d9b4b2311ba78ba6d207ab7f587414b7616d Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:19:50 +0300 Subject: [PATCH 10/12] fix attempt --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1305295..81f7620 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,28 +114,30 @@ target_include_directories(boost_stacktrace INTERFACE include) if(BOOST_STACKTRACE_ENABLE_WINDBG) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_windbg) + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_windbg" "") elseif(BOOST_STACKTRACE_ENABLE_BACKTRACE) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_backtrace) + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_backtrace" "") elseif(BOOST_STACKTRACE_ENABLE_ADDR2LINE) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_addr2line) + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_addr2line" "") elseif(BOOST_STACKTRACE_ENABLE_BASIC) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_basic) + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_basic" "") elseif(BOOST_STACKTRACE_ENABLE_NOOP) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_noop) + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_noop" "") endif() -# Boost::stacktrace_from exception is not linked by default -stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} boost_stacktrace" "") - # if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt") From 19ba6e37529234201166ad8f8da1f3239183b7bb Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:22:04 +0300 Subject: [PATCH 11/12] fix attempt --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f7620..7df452c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,27 +114,27 @@ target_include_directories(boost_stacktrace INTERFACE include) if(BOOST_STACKTRACE_ENABLE_WINDBG) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_windbg) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_windbg" "") + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_windbg" "") elseif(BOOST_STACKTRACE_ENABLE_BACKTRACE) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_backtrace) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_backtrace" "") + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_backtrace" "") elseif(BOOST_STACKTRACE_ENABLE_ADDR2LINE) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_addr2line) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_addr2line" "") + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_addr2line" "") elseif(BOOST_STACKTRACE_ENABLE_BASIC) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_basic) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_basic" "") + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_basic" "") elseif(BOOST_STACKTRACE_ENABLE_NOOP) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_noop) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS} Boost::stacktrace_noop" "") + stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_noop" "") endif() From 9c6ea61f5fb4cf8164c1133cfd9718c86f0702e4 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 17 Oct 2024 11:26:54 +0300 Subject: [PATCH 12/12] cleanup --- CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7df452c..9c5bf84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,30 +114,28 @@ target_include_directories(boost_stacktrace INTERFACE include) if(BOOST_STACKTRACE_ENABLE_WINDBG) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_windbg) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_windbg" "") elseif(BOOST_STACKTRACE_ENABLE_BACKTRACE) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_backtrace) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_backtrace" "") elseif(BOOST_STACKTRACE_ENABLE_ADDR2LINE) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_addr2line) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_addr2line" "") elseif(BOOST_STACKTRACE_ENABLE_BASIC) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_basic) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_basic" "") elseif(BOOST_STACKTRACE_ENABLE_NOOP) target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_noop) - stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};Boost::stacktrace_noop" "") endif() +# Boost::stacktrace_from_exception is never the default +stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};boost_stacktrace" "") + # if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")