Change to cmake-toolset

Signed-off-by: owent <admin@owent.net>
owent · May 20, 2021 · 4dacac6 · 4dacac6
1 parent ea1addb
commit 4dacac6
Show file tree

Hide file tree

Showing 32 changed files with 227 additions and 1,869 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,12 +1,12 @@
 ---
 Language: Cpp
 BasedOnStyle: Google
-ColumnLimit: 100
+ColumnLimit: 120
 DerivePointerAlignment: true
 PointerAlignment: Left
 
 # Only sort headers in each include block
-SortIncludes: false
+SortIncludes: true
 IncludeBlocks: Preserve
 
 # Ident #if/#else/#endif:
@@ -21,6 +21,6 @@ IndentPPDirectives: AfterHash
 ---
 Language: Proto
 BasedOnStyle: Google
-ColumnLimit: 100
+ColumnLimit: 120
 ---
 
diff --git a/.cmake-format.yaml b/.cmake-format.yaml
@@ -1,7 +1,7 @@
 # @see https://cmake-format.readthedocs.io/en/latest/configuration.html for more details
 
 format:
-  line_width: 100
+  line_width: 120
   tab_size: 2
   use_tabchars: false
   line_ending: unix

diff --git a/.gitignore b/.gitignore
@@ -24,13 +24,6 @@
 build/*
 build_*
 
-# prebuilt directory
-/3rd_party/*/prebuilt
-/3rd_party/*/pkg
-/3rd_party/libuv/repo-*
-/3rd_party/c_cpp_utils/repo
-/3rd_party/atframe_utils/repo
-
 # project files
 /.idea
 /.vs
@@ -41,3 +34,10 @@ build_*
 /include/libatbus_protocol.pb.h
 /include/libatbus_protocol.pb
 /src/libatbus_protocol.pb.cc
+
+/atframework/cmake-toolset
+/atframework/atframe_utils
+
+# prebuilt directory
+/third_party/install
+/third_party/packages
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,8 @@
+[submodule "atframework/atframe_utils"]
+	path = atframework/atframe_utils
+	url = https://github.com/atframework/atframe_utils.git
+	branch = main
+[submodule "atframework/cmake-toolset"]
+	path = atframework/cmake-toolset
+	url = https://github.com/atframework/cmake-toolset.git
+	branch = main
diff --git a/.travis.yml b/.travis.yml
diff --git a/3rd_party/3rd_party.macro.cmake b/3rd_party/3rd_party.macro.cmake
diff --git a/3rd_party/FindFlatBuffers.cmake b/3rd_party/FindFlatBuffers.cmake
diff --git a/3rd_party/atframe_utils/libatframe_utils.cmake b/3rd_party/atframe_utils/libatframe_utils.cmake
diff --git a/3rd_party/atframe_utils/libatframe_utils.prepare.cmake b/3rd_party/atframe_utils/libatframe_utils.prepare.cmake