diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/utils/CMakeLists.txt (renamed from utils/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | src/utils/addr2name.cpp (renamed from utils/addr2name.cpp) | 0 | ||||
| -rw-r--r-- | src/utils/command_line.hpp (renamed from utils/command_line.hpp) | 0 | ||||
| -rw-r--r-- | src/utils/enum_symbols.cpp (renamed from utils/enum_symbols.cpp) | 0 | ||||
| -rw-r--r-- | src/utils/name2addr.cpp (renamed from utils/name2addr.cpp) | 0 | ||||
| -rw-r--r-- | src/utils/pdb_descr.hpp (renamed from utils/pdb_descr.hpp) | 0 |
8 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0897012..09cdb18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,5 @@ add_subdirectory(3rdparty/winapi/common EXCLUDE_FROM_ALL) add_subdirectory(src) add_subdirectory(test) -add_subdirectory(utils) install(FILES LICENSE.txt DESTINATION share) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e33a267..a78f35a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ find_package(Boost CONFIG REQUIRED) file(GLOB_RECURSE winapi_debug_include CONFIGURE_DEPENDS "../include/*.hpp") -file(GLOB_RECURSE winapi_debug_src CONFIGURE_DEPENDS "*.cpp") +file(GLOB winapi_debug_src CONFIGURE_DEPENDS "*.cpp") add_library(winapi_debug ${winapi_debug_include} ${winapi_debug_src}) target_compile_definitions(winapi_debug PUBLIC _NO_CVCONST_H) target_include_directories(winapi_debug PUBLIC ../include/) @@ -19,3 +19,5 @@ if(MSVC_VERSION EQUAL 1900) # DbgHelp warnings on Visual Studio 2015: target_compile_options(winapi_debug PUBLIC /wd4091) endif() + +add_subdirectory(utils) diff --git a/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index ce0ec07..51ab17d 100644 --- a/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -17,7 +17,7 @@ add_util(addr2name addr2name.cpp command_line.hpp pdb_descr.hpp) if(MSVC) find_package(Python3 REQUIRED COMPONENTS Interpreter) add_test(NAME enum_symbols COMMAND Python3::Interpreter - "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/tools/ctest-driver.py" + "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/tools/ctest-driver.py" run --pass-regex test_ns::baz test_ns::bar test_ns::foo test_ns::var -- diff --git a/utils/addr2name.cpp b/src/utils/addr2name.cpp index 98b53b9..98b53b9 100644 --- a/utils/addr2name.cpp +++ b/src/utils/addr2name.cpp diff --git a/utils/command_line.hpp b/src/utils/command_line.hpp index d3178f1..d3178f1 100644 --- a/utils/command_line.hpp +++ b/src/utils/command_line.hpp diff --git a/utils/enum_symbols.cpp b/src/utils/enum_symbols.cpp index 645bc13..645bc13 100644 --- a/utils/enum_symbols.cpp +++ b/src/utils/enum_symbols.cpp diff --git a/utils/name2addr.cpp b/src/utils/name2addr.cpp index d253aa9..d253aa9 100644 --- a/utils/name2addr.cpp +++ b/src/utils/name2addr.cpp diff --git a/utils/pdb_descr.hpp b/src/utils/pdb_descr.hpp index c2e720a..c2e720a 100644 --- a/utils/pdb_descr.hpp +++ b/src/utils/pdb_descr.hpp |