Skip to content

Commit f2a12e7

Browse files
committed
调整目录 src test
1 parent 39c0a57 commit f2a12e7

28 files changed

+15
-291
lines changed

CMakeLists.txt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#############################################################################
88

99
message("[data-backup-module] -------- start")
10-
cmake_minimum_required(VERSION 3.7.2)
11-
set(CMAKE_CXX_STANDARD 11)
10+
cmake_minimum_required(VERSION 3.16)
11+
set(CMAKE_CXX_STANDARD 20)
1212
set(CXX_STANDARD_REQUIRED ON)
1313

14-
if (WIN32)
14+
if(WIN32)
1515
# 源码使用 utf-8 编码格式编译
1616
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
1717
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@@ -20,7 +20,7 @@ if (WIN32)
2020
# 手动启用 /permissive- 标准一致性模式(VS2017+)
2121
# 手动启用 /EHsc C++ 异常: https://learn.microsoft.com/zh-cn/cpp/build/reference/eh-exception-handling-model
2222
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /permissive- /Zc:__cplusplus")
23-
elseif (APPLE)
23+
elseif(APPLE)
2424
# 编译动态库需要设置-fPIC
2525
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
2626
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
@@ -70,24 +70,20 @@ else()
7070
endif()
7171
message(STATUS "[data-backup-module] CMAKE_TOOLCHAIN_FILE : ${CMAKE_TOOLCHAIN_FILE}")
7272

73-
project ("data-backup-module")
73+
project("data-backup-module")
7474

7575
message(STATUS "[data-backup-module] CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
7676
message(STATUS "[data-backup-module] CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
7777
message(STATUS "[data-backup-module] CMAKE_CURRENT_SOURCE_DIR : ${CMAKE_CURRENT_SOURCE_DIR}")
7878
message(STATUS "[data-backup-module] PROJECT_SOURCE_DIR : ${PROJECT_SOURCE_DIR}")
7979

8080
# src
81-
include_directories(${PROJECT_SOURCE_DIR}/sample-tools)
82-
include_directories(${PROJECT_SOURCE_DIR}/sample-dynamic-lib)
83-
include_directories(${PROJECT_SOURCE_DIR}/sample-main)
84-
add_subdirectory(sample-tools)
85-
add_subdirectory(sample-dynamic-lib)
86-
add_subdirectory(sample-main)
81+
include_directories(${PROJECT_SOURCE_DIR}/src)
82+
add_subdirectory(src)
8783

8884
# test
8985
include(CTest) # 支持 ctest 命令
90-
include_directories(${PROJECT_SOURCE_DIR}/sample-tools-test)
91-
add_subdirectory(sample-tools-test)
86+
include_directories(${PROJECT_SOURCE_DIR}/test)
87+
add_subdirectory(test)
9288

9389
message("[data-backup-module] -------- done")

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# data-backup-module
22

3-
![workflow](https://github.com/zxffffffff/data-backup-module/actions/workflows/build-windows.yml/badge.svg?event=push)
4-
![workflow](https://github.com/zxffffffff/data-backup-module/actions/workflows/build-macos.yml/badge.svg?event=push)
5-
![workflow](https://github.com/zxffffffff/data-backup-module/actions/workflows/build-ubuntu.yml/badge.svg?event=push)
3+
![workflow](https://github.com/tech-legacy/data-backup-module/actions/workflows/build-windows.yml/badge.svg?event=push)
4+
![workflow](https://github.com/tech-legacy/data-backup-module/actions/workflows/build-macos.yml/badge.svg?event=push)
5+
![workflow](https://github.com/tech-legacy/data-backup-module/actions/workflows/build-ubuntu.yml/badge.svg?event=push)
66

77
分布式数据加密备份

sample-dynamic-lib/CMakeLists.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.

sample-dynamic-lib/SampleDynamicLib.cpp

Lines changed: 0 additions & 21 deletions
This file was deleted.

sample-dynamic-lib/SampleDynamicLib.h

Lines changed: 0 additions & 24 deletions
This file was deleted.

sample-dynamic-lib/define.h

Lines changed: 0 additions & 36 deletions
This file was deleted.

sample-main/CMakeLists.txt

Lines changed: 0 additions & 33 deletions
This file was deleted.

sample-main/main.cpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

sample-tools-test/platform_test.cpp

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
##
77
#############################################################################
88

9-
project(sample-tools)
9+
project(data-backup)
1010
message("[${PROJECT_NAME}] -------- start")
1111

1212
message(STATUS "[${PROJECT_NAME}] PROJECT_SOURCE_DIR : ${PROJECT_SOURCE_DIR}")

0 commit comments

Comments
 (0)