[ox] Move ptrarith into fs
This commit is contained in:
parent
5a8e16c3f3
commit
40f2537c05
1
deps/ox/src/ox/CMakeLists.txt
vendored
1
deps/ox/src/ox/CMakeLists.txt
vendored
@ -5,6 +5,5 @@ add_subdirectory(clargs)
|
|||||||
add_subdirectory(claw)
|
add_subdirectory(claw)
|
||||||
add_subdirectory(fs)
|
add_subdirectory(fs)
|
||||||
add_subdirectory(mc)
|
add_subdirectory(mc)
|
||||||
add_subdirectory(ptrarith)
|
|
||||||
add_subdirectory(model)
|
add_subdirectory(model)
|
||||||
add_subdirectory(std)
|
add_subdirectory(std)
|
||||||
|
9
deps/ox/src/ox/fs/CMakeLists.txt
vendored
9
deps/ox/src/ox/fs/CMakeLists.txt
vendored
@ -59,6 +59,14 @@ install(
|
|||||||
include/ox/fs/filesystem
|
include/ox/fs/filesystem
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
ptrarith/nodebuffer.hpp
|
||||||
|
ptrarith/ptr.hpp
|
||||||
|
DESTINATION
|
||||||
|
include/ox/fs/ptrarith
|
||||||
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
TARGETS
|
TARGETS
|
||||||
OxFS
|
OxFS
|
||||||
@ -68,4 +76,5 @@ install(
|
|||||||
|
|
||||||
if(OX_RUN_TESTS)
|
if(OX_RUN_TESTS)
|
||||||
add_subdirectory(test)
|
add_subdirectory(test)
|
||||||
|
add_subdirectory(ptrarith/test)
|
||||||
endif()
|
endif()
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <ox/ptrarith/nodebuffer.hpp>
|
#include <ox/fs/ptrarith/nodebuffer.hpp>
|
||||||
|
|
||||||
namespace ox {
|
namespace ox {
|
||||||
|
|
||||||
|
2
deps/ox/src/ox/fs/filesystem/directory.hpp
vendored
2
deps/ox/src/ox/fs/filesystem/directory.hpp
vendored
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include <ox/fs/filesystem/pathiterator.hpp>
|
#include <ox/fs/filesystem/pathiterator.hpp>
|
||||||
#include <ox/fs/filestore/filestoretemplate.hpp>
|
#include <ox/fs/filestore/filestoretemplate.hpp>
|
||||||
#include <ox/ptrarith/nodebuffer.hpp>
|
#include <ox/fs/ptrarith/nodebuffer.hpp>
|
||||||
#include <ox/std/byteswap.hpp>
|
#include <ox/std/byteswap.hpp>
|
||||||
|
|
||||||
#include "types.hpp"
|
#include "types.hpp"
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <ox/ptrarith/nodebuffer.hpp>
|
#include <ox/fs/ptrarith/nodebuffer.hpp>
|
||||||
#include <ox/std/std.hpp>
|
#include <ox/std/std.hpp>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
11
deps/ox/src/ox/ptrarith/CMakeLists.txt
vendored
11
deps/ox/src/ox/ptrarith/CMakeLists.txt
vendored
@ -1,11 +0,0 @@
|
|||||||
install(
|
|
||||||
FILES
|
|
||||||
nodebuffer.hpp
|
|
||||||
ptr.hpp
|
|
||||||
DESTINATION
|
|
||||||
include/ox/ptrarith
|
|
||||||
)
|
|
||||||
|
|
||||||
if(OX_RUN_TESTS)
|
|
||||||
add_subdirectory(test)
|
|
||||||
endif()
|
|
Loading…
x
Reference in New Issue
Block a user