From 256f5f6041db3750328f1a9fddfc934d2e357fb3 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Fri, 2 Dec 2016 00:35:25 +0300 Subject: [PATCH] Rename src and move include directory --- CMakeLists.txt | 4 +-- {src => easy_profiler_core}/CMakeLists.txt | 30 ++++++++++--------- {src => easy_profiler_core}/block.cpp | 0 {src => easy_profiler_core}/current_time.h | 0 {src => easy_profiler_core}/easy_socket.cpp | 0 .../event_trace_status.h | 0 .../event_trace_win.cpp | 0 {src => easy_profiler_core}/event_trace_win.h | 0 {src => easy_profiler_core}/hashed_cstr.h | 0 .../include}/easy/easy_compiler_support.h | 0 .../include}/easy/easy_net.h | 0 .../include}/easy/easy_socket.h | 0 .../include}/easy/profiler.h | 0 .../include}/easy/profiler_aux.h | 0 .../include}/easy/profiler_colors.h | 0 .../include}/easy/reader.h | 0 .../include}/easy/serialized_block.h | 0 {src => easy_profiler_core}/outstream.h | 0 .../profile_manager.cpp | 0 {src => easy_profiler_core}/profile_manager.h | 0 {src => easy_profiler_core}/reader.cpp | 0 {src => easy_profiler_core}/resources.rc | 0 {src => easy_profiler_core}/spin_lock.h | 0 {src => easy_profiler_core}/version.info | 0 24 files changed, 18 insertions(+), 16 deletions(-) rename {src => easy_profiler_core}/CMakeLists.txt (78%) rename {src => easy_profiler_core}/block.cpp (100%) rename {src => easy_profiler_core}/current_time.h (100%) rename {src => easy_profiler_core}/easy_socket.cpp (100%) rename {src => easy_profiler_core}/event_trace_status.h (100%) rename {src => easy_profiler_core}/event_trace_win.cpp (100%) rename {src => easy_profiler_core}/event_trace_win.h (100%) rename {src => easy_profiler_core}/hashed_cstr.h (100%) rename {include => easy_profiler_core/include}/easy/easy_compiler_support.h (100%) rename {include => easy_profiler_core/include}/easy/easy_net.h (100%) rename {include => easy_profiler_core/include}/easy/easy_socket.h (100%) rename {include => easy_profiler_core/include}/easy/profiler.h (100%) rename {include => easy_profiler_core/include}/easy/profiler_aux.h (100%) rename {include => easy_profiler_core/include}/easy/profiler_colors.h (100%) rename {include => easy_profiler_core/include}/easy/reader.h (100%) rename {include => easy_profiler_core/include}/easy/serialized_block.h (100%) rename {src => easy_profiler_core}/outstream.h (100%) rename {src => easy_profiler_core}/profile_manager.cpp (100%) rename {src => easy_profiler_core}/profile_manager.h (100%) rename {src => easy_profiler_core}/reader.cpp (100%) rename {src => easy_profiler_core}/resources.rc (100%) rename {src => easy_profiler_core}/spin_lock.h (100%) rename {src => easy_profiler_core}/version.info (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 782c1a3..e7f0e0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ) include_directories( - include + easy_profiler_core/include ) if(UNIX) @@ -39,7 +39,7 @@ endif(UNIX) set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR}/sdk) -add_subdirectory(src) +add_subdirectory(easy_profiler_core) add_subdirectory(profiler_gui) add_subdirectory(sample) diff --git a/src/CMakeLists.txt b/easy_profiler_core/CMakeLists.txt similarity index 78% rename from src/CMakeLists.txt rename to easy_profiler_core/CMakeLists.txt index 1318a7b..a5ad4ea 100644 --- a/src/CMakeLists.txt +++ b/easy_profiler_core/CMakeLists.txt @@ -15,21 +15,23 @@ set(H_FILES event_trace_win.h current_time.h ) +include_directories( + include +) + +set(INCLUDE_FILES + include/easy/profiler.h + include/easy/reader.h + include/easy/easy_net.h + include/easy/easy_socket.h + include/easy/easy_compiler_support.h + include/easy/profiler_aux.h + include/easy/profiler_colors.h + include/easy/reader.h + include/easy/serialized_block.h +) +source_group(include FILES ${INCLUDE_FILES}) -if(DEFINED EASY_ROOT) - set(INCLUDE_FILES - ${EASY_ROOT}/include/easy/profiler.h - ${EASY_ROOT}/include/easy/reader.h - ${EASY_ROOT}/include/easy/easy_net.h - ${EASY_ROOT}/include/easy/easy_socket.h - ${EASY_ROOT}/include/easy/easy_compiler_support.h - ${EASY_ROOT}/include/easy/profiler_aux.h - ${EASY_ROOT}/include/easy/profiler_colors.h - ${EASY_ROOT}/include/easy/reader.h - ${EASY_ROOT}/include/easy/serialized_block.h - ) - source_group(include FILES ${INCLUDE_FILES}) -endif(DEFINED EASY_ROOT) if(NOT DEFINED EASY_PRODUCT_VERSION_STRING) file (STRINGS ${CMAKE_CURRENT_LIST_DIR}/version.info EASY_PRODUCT_VERSION_STRING) diff --git a/src/block.cpp b/easy_profiler_core/block.cpp similarity index 100% rename from src/block.cpp rename to easy_profiler_core/block.cpp diff --git a/src/current_time.h b/easy_profiler_core/current_time.h similarity index 100% rename from src/current_time.h rename to easy_profiler_core/current_time.h diff --git a/src/easy_socket.cpp b/easy_profiler_core/easy_socket.cpp similarity index 100% rename from src/easy_socket.cpp rename to easy_profiler_core/easy_socket.cpp diff --git a/src/event_trace_status.h b/easy_profiler_core/event_trace_status.h similarity index 100% rename from src/event_trace_status.h rename to easy_profiler_core/event_trace_status.h diff --git a/src/event_trace_win.cpp b/easy_profiler_core/event_trace_win.cpp similarity index 100% rename from src/event_trace_win.cpp rename to easy_profiler_core/event_trace_win.cpp diff --git a/src/event_trace_win.h b/easy_profiler_core/event_trace_win.h similarity index 100% rename from src/event_trace_win.h rename to easy_profiler_core/event_trace_win.h diff --git a/src/hashed_cstr.h b/easy_profiler_core/hashed_cstr.h similarity index 100% rename from src/hashed_cstr.h rename to easy_profiler_core/hashed_cstr.h diff --git a/include/easy/easy_compiler_support.h b/easy_profiler_core/include/easy/easy_compiler_support.h similarity index 100% rename from include/easy/easy_compiler_support.h rename to easy_profiler_core/include/easy/easy_compiler_support.h diff --git a/include/easy/easy_net.h b/easy_profiler_core/include/easy/easy_net.h similarity index 100% rename from include/easy/easy_net.h rename to easy_profiler_core/include/easy/easy_net.h diff --git a/include/easy/easy_socket.h b/easy_profiler_core/include/easy/easy_socket.h similarity index 100% rename from include/easy/easy_socket.h rename to easy_profiler_core/include/easy/easy_socket.h diff --git a/include/easy/profiler.h b/easy_profiler_core/include/easy/profiler.h similarity index 100% rename from include/easy/profiler.h rename to easy_profiler_core/include/easy/profiler.h diff --git a/include/easy/profiler_aux.h b/easy_profiler_core/include/easy/profiler_aux.h similarity index 100% rename from include/easy/profiler_aux.h rename to easy_profiler_core/include/easy/profiler_aux.h diff --git a/include/easy/profiler_colors.h b/easy_profiler_core/include/easy/profiler_colors.h similarity index 100% rename from include/easy/profiler_colors.h rename to easy_profiler_core/include/easy/profiler_colors.h diff --git a/include/easy/reader.h b/easy_profiler_core/include/easy/reader.h similarity index 100% rename from include/easy/reader.h rename to easy_profiler_core/include/easy/reader.h diff --git a/include/easy/serialized_block.h b/easy_profiler_core/include/easy/serialized_block.h similarity index 100% rename from include/easy/serialized_block.h rename to easy_profiler_core/include/easy/serialized_block.h diff --git a/src/outstream.h b/easy_profiler_core/outstream.h similarity index 100% rename from src/outstream.h rename to easy_profiler_core/outstream.h diff --git a/src/profile_manager.cpp b/easy_profiler_core/profile_manager.cpp similarity index 100% rename from src/profile_manager.cpp rename to easy_profiler_core/profile_manager.cpp diff --git a/src/profile_manager.h b/easy_profiler_core/profile_manager.h similarity index 100% rename from src/profile_manager.h rename to easy_profiler_core/profile_manager.h diff --git a/src/reader.cpp b/easy_profiler_core/reader.cpp similarity index 100% rename from src/reader.cpp rename to easy_profiler_core/reader.cpp diff --git a/src/resources.rc b/easy_profiler_core/resources.rc similarity index 100% rename from src/resources.rc rename to easy_profiler_core/resources.rc diff --git a/src/spin_lock.h b/easy_profiler_core/spin_lock.h similarity index 100% rename from src/spin_lock.h rename to easy_profiler_core/spin_lock.h diff --git a/src/version.info b/easy_profiler_core/version.info similarity index 100% rename from src/version.info rename to easy_profiler_core/version.info