Finish move to CMake.

stuart6854 · Nov 24, 2023 · 3456ddf · 3456ddf
1 parent 06508ac
commit 3456ddf
Show file tree

Hide file tree

Showing 15 changed files with 406 additions and 472 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,54 @@
+Language: Cpp
+BasedOnStyle: LLVM
+
+AccessModifierOffset: -4
+AlignAfterOpenBracket: DontAlign
+AlignEscapedNewlines: Left
+AlignOperands: DontAlign
+AlignTrailingComments: true
+AlignArrayOfStructures: Right
+AllowShortBlocksOnASingleLine: Empty
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: All
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: false
+  BeforeWhile: true
+  IndentBraces: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakInheritanceList: AfterColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakStringLiterals: false
+ColumnLimit: 160
+Cpp11BracedListStyle: false
+EmptyLineBeforeAccessModifier: LogicalBlock
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+IndentWidth: 4
+NamespaceIndentation: All
+PointerAlignment: Left
+SortIncludes: Never
+SpaceBeforeCaseColon: false
+TabWidth: 4
+UseTab: Always
+SeparateDefinitionBlocks: Leave
+AlwaysBreakTemplateDeclarations: Yes
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,14 +25,14 @@ set_target_properties(gfs PROPERTIES
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
 )
-target_link_directories(gfs PRIVATE lz4_static)
+target_link_libraries(gfs PRIVATE lz4_static)
 
 if(${GFS_BUILD_TESTS})
     message(STATUS "Building testbed")
     add_subdirectory(testbed)
 endif()
 
 if(${GFS_BUILD_BENCHMARK})
-    message(STATUS "Building benchmarks")
-    add_subdirectory(benchmarks)
+    message(STATUS "Building benchmark")
+    add_subdirectory(benchmark)
 endif()
diff --git a/GenerateProj_GMake2.sh b/GenerateProj_GMake2.sh
diff --git a/GenerateProj_VS2022.bat b/GenerateProj_VS2022.bat
diff --git a/benchmarks/CMakeLists.txt → benchmark/CMakeLists.txt b/benchmarks/CMakeLists.txt → benchmark/CMakeLists.txt
@@ -1,11 +1,12 @@
-add_library(gfs_benchmark
+add_executable(gfs_benchmark
     benchmark.cpp
 )
 target_include_directories(gfs_benchmark PUBLIC include)
 set_target_properties(gfs_benchmark PROPERTIES 
     CXX_STANDARD 17
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS OFF
+    OUTPUT_NAME benchmark
 )
 
 target_link_libraries(gfs_benchmark PRIVATE gfs)
diff --git a/benchmarks/benchmark.cpp → benchmark/benchmark.cpp b/benchmarks/benchmark.cpp → benchmark/benchmark.cpp
diff --git a/benchmarks/build_benchmark.lua b/benchmarks/build_benchmark.lua
diff --git a/build.lua b/build.lua
diff --git a/build_gfs.lua b/build_gfs.lua
diff --git a/include/gfs/filesystem.hpp b/include/gfs/filesystem.hpp
@@ -131,6 +131,12 @@ namespace gfs
         */
         bool ReadFile(FileID fileId, BinaryStreamable& dataObject);
 
+        /////////////////////////////////////////////////////////////////////////
+        // Archives
+        //////////////////////////////////////////////////////////////////////////
+
+        bool CreateArchive(MountID mount, const std::filesystem::path& filename, const std::vector<FileID>& files);
+
         //////////////////////////////////////////////////////////////////////////
         // Import
         //////////////////////////////////////////////////////////////////////////