From e47f1980ef8d3e54379869cc4414d7dfa64d9f25 Mon Sep 17 00:00:00 2001 From: Aleksandar Janicijevic Date: Fri, 31 Jan 2025 11:39:55 -0500 Subject: [PATCH 1/3] Fixed a bug in parsing command line arguments --- source/timemory/utility/argparse.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/timemory/utility/argparse.cpp b/source/timemory/utility/argparse.cpp index 28b051d84..314a2e20b 100644 --- a/source/timemory/utility/argparse.cpp +++ b/source/timemory/utility/argparse.cpp @@ -985,9 +985,7 @@ argument_parser::parse(const std::vector& _args, int verbose_level) // execute the argument-specific actions for(auto& itr : m_arg_map) { - if(exists(itr.first)) - itr.second->execute_actions(*this); - else if(itr.second->m_default) + if(exists(itr.first) || itr.second->m_is_default) itr.second->execute_actions(*this); } From d6ffeb93cce303e36895e05f0ff0ce3c0eccc7d1 Mon Sep 17 00:00:00 2001 From: Aleksandar Janicijevic Date: Fri, 31 Jan 2025 11:48:18 -0500 Subject: [PATCH 2/3] Fixed file format --- source/timemory/utility/filepath.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/timemory/utility/filepath.cpp b/source/timemory/utility/filepath.cpp index d685f6e87..2d724163b 100644 --- a/source/timemory/utility/filepath.cpp +++ b/source/timemory/utility/filepath.cpp @@ -42,6 +42,7 @@ # include #endif +#include #include #include #include @@ -49,7 +50,6 @@ #include #include #include -#include namespace tim { From 080b204cb16f4144fbfb5c1494d0f0f4cf752e76 Mon Sep 17 00:00:00 2001 From: Aleksandar Janicijevic Date: Fri, 31 Jan 2025 11:53:18 -0500 Subject: [PATCH 3/3] Fixed cmake formatting --- cmake/Modules/ConfigBinutils.cmake | 3 +-- cmake/Modules/ConfigLibunwind.cmake | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/ConfigBinutils.cmake b/cmake/Modules/ConfigBinutils.cmake index 837bf6b3b..fd265121a 100644 --- a/cmake/Modules/ConfigBinutils.cmake +++ b/cmake/Modules/ConfigBinutils.cmake @@ -74,8 +74,7 @@ include(ExternalProject) externalproject_add( binutils-external PREFIX ${PROJECT_BINARY_DIR}/external/binutils - URL - ${TIMEMORY_BINUTILS_DOWNLOAD_URL} + URL ${TIMEMORY_BINUTILS_DOWNLOAD_URL} http://ftpmirror.gnu.org/gnu/binutils/binutils-2.40.tar.gz http://mirrors.kernel.org/sourceware/binutils/releases/binutils-2.40.tar.gz BUILD_IN_SOURCE 1 diff --git a/cmake/Modules/ConfigLibunwind.cmake b/cmake/Modules/ConfigLibunwind.cmake index 079610c1b..c679a5c77 100644 --- a/cmake/Modules/ConfigLibunwind.cmake +++ b/cmake/Modules/ConfigLibunwind.cmake @@ -149,7 +149,8 @@ if(TIMEMORY_INSTALL_HEADERS) endforeach() endif() -file(GLOB libunwind_libs "${PROJECT_BINARY_DIR}/external/libunwind/install/${CMAKE_INSTALL_LIBDIR}/*") +file(GLOB libunwind_libs + "${PROJECT_BINARY_DIR}/external/libunwind/install/${CMAKE_INSTALL_LIBDIR}/*") foreach(_LIB ${libunwind_libs}) if(IS_DIRECTORY ${_LIB}) @@ -176,7 +177,8 @@ target_include_directories( INTERFACE $ $) target_link_directories( - timemory-libunwind INTERFACE + timemory-libunwind + INTERFACE $ $) target_link_libraries(