tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced format file

v1
Brett 2024-09-05 17:18:30 -04:00
parent 7198a8b0c3
commit 7410dfe0ff
7 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
include(cmake/color.cmake) include(cmake/color.cmake)
set(BLT_VERSION 0.19.7) set(BLT_VERSION 0.20.0)
set(BLT_TEST_VERSION 0.0.1) set(BLT_TEST_VERSION 0.0.1)
set(BLT_TARGET BLT) set(BLT_TARGET BLT)
@ -17,6 +17,7 @@ option(BUILD_STD "Build the BLT standard utilities." ON)
option(BUILD_PROFILING "Build the BLT profiler extension" ON) option(BUILD_PROFILING "Build the BLT profiler extension" ON)
option(BUILD_FS "Build the BLT FS utilities including the NBT + eNBT extension" ON) option(BUILD_FS "Build the BLT FS utilities including the NBT + eNBT extension" ON)
option(BUILD_PARSE "Build the BLT parsers" ON) option(BUILD_PARSE "Build the BLT parsers" ON)
option(BUILD_FORMAT "Build the BLT formatters" ON)
option(BUILD_TESTS "Build the BLT test set" OFF) option(BUILD_TESTS "Build the BLT test set" OFF)
@ -64,6 +65,13 @@ else ()
set(PARSE_FILES "") set(PARSE_FILES "")
endif () endif ()
if (${BUILD_FORMAT})
message(STATUS "Building ${Yellow}format${ColourReset} cxx files")
file(GLOB_RECURSE FORMAT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/blt/format/*.cpp")
else ()
set(FORMAT_FILES "")
endif ()
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libraries/parallel-hashmap) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libraries/parallel-hashmap)
message("Found Parallel Hashmaps library, using ${Yellow}phmap${ColourReset} over ${Red}std::unordered_map${ColourReset}") message("Found Parallel Hashmaps library, using ${Yellow}phmap${ColourReset} over ${Red}std::unordered_map${ColourReset}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libraries/parallel-hashmap) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libraries/parallel-hashmap)
@ -83,7 +91,7 @@ endif ()
include_directories(include/) include_directories(include/)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/config/) include_directories(${CMAKE_CURRENT_BINARY_DIR}/config/)
add_library(${BLT_TARGET} ${STD_FILES} ${PROFILING_FILES} ${FS_FILES} ${PARSE_FILES}) add_library(${BLT_TARGET} ${STD_FILES} ${PROFILING_FILES} ${FS_FILES} ${PARSE_FILES} ${FORMAT_FILES})
string(REPLACE "+" "\\+" escaped_source ${CMAKE_CURRENT_SOURCE_DIR}) string(REPLACE "+" "\\+" escaped_source ${CMAKE_CURRENT_SOURCE_DIR})
string(APPEND escaped_source "/src/blt/.*/") string(APPEND escaped_source "/src/blt/.*/")

2
include/blt/std/format.h → include/blt/format/format.h
View File

@ -15,7 +15,7 @@
#include <algorithm> #include <algorithm>
#include <string_view> #include <string_view>
#include "memory.h" #include "memory.h"
#include "vector.h" #include <blt/std/vector.h>
#include <variant> #include <variant>
namespace blt::string namespace blt::string

2
include/blt/fs/nbt.h
View File

@ -13,7 +13,7 @@
#include <unordered_map> #include <unordered_map>
#include <algorithm> #include <algorithm>
#include "blt/std/format.h" #include "blt/format/format.h"
#include "blt/fs/filesystem.h" #include "blt/fs/filesystem.h"
#include "blt/std/logging.h" #include "blt/std/logging.h"
#include "blt/std/memory.h" #include "blt/std/memory.h"

2
libraries/parallel-hashmap

@ -1 +1 @@
Subproject commit d88c5e15079047777b418132ece5879e7c9aaa2b Subproject commit 8a889d3699b3c09ade435641fb034427f3fd12b6

2
src/blt/std/format.cpp → src/blt/format/format.cpp
View File

@ -3,7 +3,7 @@
* Licensed under GNU General Public License V3.0 * Licensed under GNU General Public License V3.0
* See LICENSE file for license detail * See LICENSE file for license detail
*/ */
#include <blt/std/format.h> #include <blt/format/format.h>
#include <blt/std/string.h> #include <blt/std/string.h>
#include <cmath> #include <cmath>
#include "blt/std/logging.h" #include "blt/std/logging.h"

2
src/blt/profiling/profiler.cpp
View File

@ -10,7 +10,7 @@
#include <blt/std/logging.h> #include <blt/std/logging.h>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
#include <blt/std/format.h> #include <blt/format/format.h>
#define TIME_FUNCTION blt::system::getCPUThreadTime() #define TIME_FUNCTION blt::system::getCPUThreadTime()

2
src/blt/profiling/profiler_v2.cpp
View File

@ -6,7 +6,7 @@
#include <blt/profiling/profiler_v2.h> #include <blt/profiling/profiler_v2.h>
#include <blt/std/time.h> #include <blt/std/time.h>
#include <blt/std/system.h> #include <blt/std/system.h>
#include <blt/std/format.h> #include <blt/format/format.h>
#include <functional> #include <functional>
#include <blt/std/hashmap.h> #include <blt/std/hashmap.h>
#include <blt/compatibility.h> #include <blt/compatibility.h>