From eec2be16ee4fb1ee42e656baa9a55c3bd7c394b9 Mon Sep 17 00:00:00 2001 From: zcy <290198252@qq.com> Date: Wed, 30 Sep 2020 15:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=8B=E5=8A=A8?= =?UTF-8?q?Merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/General.iml | 2 - .idea/misc.xml | 9 - .idea/modules.xml | 8 - .idea/workspace.xml | 203 ------ .vscode/cmake-kits.json | 49 -- CMakeLists.txt | 11 +- cmake-build-debug/CMakeCache.txt | 430 ----------- .../CMakeFiles/3.15.3/CMakeCCompiler.cmake | 76 -- .../CMakeFiles/3.15.3/CMakeCXXCompiler.cmake | 79 --- .../CMakeFiles/3.15.3/CMakeRCCompiler.cmake | 6 - .../CMakeFiles/3.15.3/CMakeSystem.cmake | 15 - .../3.15.3/CompilerIdC/CMakeCCompilerId.c | 665 ------------------ .../CompilerIdCXX/CMakeCXXCompilerId.cpp | 644 ----------------- .../CMakeDirectoryInformation.cmake | 16 - .../CMakeFiles/General.dir/cmake_clean.cmake | 17 - .../General.dir/cmake_clean_target.cmake | 3 - .../CMakeFiles/General.dir/flags.make | 10 - .../CMakeFiles/General.dir/link.txt | 2 - .../CMakeFiles/General.dir/progress.make | 10 - cmake-build-debug/CMakeFiles/Makefile.cmake | 60 -- cmake-build-debug/CMakeFiles/Makefile2 | 152 ---- .../CMakeFiles/TargetDirectories.txt | 6 - .../CMakeFiles/clion-environment.txt | 4 - .../CMakeFiles/cmake.check_cache | 1 - cmake-build-debug/CMakeFiles/progress.marks | 1 - cmake-build-debug/Makefile | 191 ----- cmake-build-debug/cmake_install.cmake | 50 -- general/src/utils.cpp | 19 +- libd/libgeneral.a | Bin 3199208 -> 0 bytes libd/libgenerallib.a | Bin 942036 -> 0 bytes 30 files changed, 4 insertions(+), 2735 deletions(-) delete mode 100644 .idea/General.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/workspace.xml delete mode 100644 .vscode/cmake-kits.json delete mode 100644 cmake-build-debug/CMakeCache.txt delete mode 100644 cmake-build-debug/CMakeFiles/3.15.3/CMakeCCompiler.cmake delete mode 100644 cmake-build-debug/CMakeFiles/3.15.3/CMakeCXXCompiler.cmake delete mode 100644 cmake-build-debug/CMakeFiles/3.15.3/CMakeRCCompiler.cmake delete mode 100644 cmake-build-debug/CMakeFiles/3.15.3/CMakeSystem.cmake delete mode 100644 cmake-build-debug/CMakeFiles/3.15.3/CompilerIdC/CMakeCCompilerId.c delete mode 100644 cmake-build-debug/CMakeFiles/3.15.3/CompilerIdCXX/CMakeCXXCompilerId.cpp delete mode 100644 cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake delete mode 100644 cmake-build-debug/CMakeFiles/General.dir/cmake_clean.cmake delete mode 100644 cmake-build-debug/CMakeFiles/General.dir/cmake_clean_target.cmake delete mode 100644 cmake-build-debug/CMakeFiles/General.dir/flags.make delete mode 100644 cmake-build-debug/CMakeFiles/General.dir/link.txt delete mode 100644 cmake-build-debug/CMakeFiles/General.dir/progress.make delete mode 100644 cmake-build-debug/CMakeFiles/Makefile.cmake delete mode 100644 cmake-build-debug/CMakeFiles/Makefile2 delete mode 100644 cmake-build-debug/CMakeFiles/TargetDirectories.txt delete mode 100644 cmake-build-debug/CMakeFiles/clion-environment.txt delete mode 100644 cmake-build-debug/CMakeFiles/cmake.check_cache delete mode 100644 cmake-build-debug/CMakeFiles/progress.marks delete mode 100644 cmake-build-debug/Makefile delete mode 100644 cmake-build-debug/cmake_install.cmake delete mode 100644 libd/libgeneral.a delete mode 100644 libd/libgenerallib.a diff --git a/.idea/General.iml b/.idea/General.iml deleted file mode 100644 index f08604b..0000000 --- a/.idea/General.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4219e70..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 46db6ba..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 1e40e62..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - -