diff --git a/deps/ox/CMakeLists.txt b/deps/ox/CMakeLists.txt index f2c4ea85..d13b8aee 100644 --- a/deps/ox/CMakeLists.txt +++ b/deps/ox/CMakeLists.txt @@ -1,4 +1,5 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.19) +set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19 project(Ox) diff --git a/deps/ox/src/ox/claw/test/CMakeLists.txt b/deps/ox/src/ox/claw/test/CMakeLists.txt index db45b4f6..665664e2 100644 --- a/deps/ox/src/ox/claw/test/CMakeLists.txt +++ b/deps/ox/src/ox/claw/test/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries( OxClaw ) -add_test("Test\\ ClawTest\\ ClawHeaderReader" ClawTest ClawHeaderReader) -add_test("Test\\ ClawTest\\ ClawHeaderReader2" ClawTest ClawHeaderReader2) -add_test("Test\\ ClawTest\\ ClawWriter" ClawTest ClawWriter) -add_test("Test\\ ClawTest\\ ClawReader" ClawTest ClawReader) +add_test("Test ClawTest ClawHeaderReader" ClawTest ClawHeaderReader) +add_test("Test ClawTest ClawHeaderReader2" ClawTest ClawHeaderReader2) +add_test("Test ClawTest ClawWriter" ClawTest ClawWriter) +add_test("Test ClawTest ClawReader" ClawTest ClawReader) diff --git a/deps/ox/src/ox/fs/test/CMakeLists.txt b/deps/ox/src/ox/fs/test/CMakeLists.txt index 59926098..7448b579 100644 --- a/deps/ox/src/ox/fs/test/CMakeLists.txt +++ b/deps/ox/src/ox/fs/test/CMakeLists.txt @@ -10,18 +10,18 @@ target_link_libraries( OxMetalClaw ) -add_test("Test\\ PathIterator::next1" FSTests PathIterator::next1) -add_test("Test\\ PathIterator::next2" FSTests PathIterator::next2) -add_test("Test\\ PathIterator::next3" FSTests PathIterator::next3) -add_test("Test\\ PathIterator::next4" FSTests PathIterator::next4) -add_test("Test\\ PathIterator::next5" FSTests PathIterator::next5) -add_test("Test\\ PathIterator::hasNext" FSTests PathIterator::hasNext) +add_test("Test PathIterator::next1" FSTests PathIterator::next1) +add_test("Test PathIterator::next2" FSTests PathIterator::next2) +add_test("Test PathIterator::next3" FSTests PathIterator::next3) +add_test("Test PathIterator::next4" FSTests PathIterator::next4) +add_test("Test PathIterator::next5" FSTests PathIterator::next5) +add_test("Test PathIterator::hasNext" FSTests PathIterator::hasNext) -add_test("Test\\ PathIterator::dirPath" FSTests PathIterator::dirPath) -add_test("Test\\ PathIterator::fileName" FSTests PathIterator::fileName) +add_test("Test PathIterator::dirPath" FSTests PathIterator::dirPath) +add_test("Test PathIterator::fileName" FSTests PathIterator::fileName) -add_test("Test\\ NodeBuffer::insert" FSTests "NodeBuffer::insert") -add_test("Test\\ FileStore::readWrite" FSTests "FileStore::readWrite") +add_test("Test NodeBuffer::insert" FSTests "NodeBuffer::insert") +add_test("Test FileStore::readWrite" FSTests "FileStore::readWrite") -add_test("Test\\ Directory" FSTests "Directory") -add_test("Test\\ FileSystem" FSTests "FileSystem") +add_test("Test Directory" FSTests "Directory") +add_test("Test FileSystem" FSTests "FileSystem") diff --git a/deps/ox/src/ox/mc/test/CMakeLists.txt b/deps/ox/src/ox/mc/test/CMakeLists.txt index febeba47..7add66fc 100644 --- a/deps/ox/src/ox/mc/test/CMakeLists.txt +++ b/deps/ox/src/ox/mc/test/CMakeLists.txt @@ -8,8 +8,8 @@ target_link_libraries( OxMetalClaw ) -add_test("Test\\ McTest\\ Writer" McTest MetalClawWriter) -add_test("Test\\ McTest\\ Reader" McTest MetalClawReader) -add_test("Test\\ McTest\\ MetalClawDef" McTest MetalClawDef) -add_test("Test\\ McTest\\ encodeInteger" McTest encodeInteger) -add_test("Test\\ McTest\\ decodeInteger" McTest decodeInteger) +add_test("Test McTest Writer" McTest MetalClawWriter) +add_test("Test McTest Reader" McTest MetalClawReader) +add_test("Test McTest MetalClawDef" McTest MetalClawDef) +add_test("Test McTest encodeInteger" McTest encodeInteger) +add_test("Test McTest decodeInteger" McTest decodeInteger) diff --git a/deps/ox/src/ox/oc/test/CMakeLists.txt b/deps/ox/src/ox/oc/test/CMakeLists.txt index 39281829..243d0367 100644 --- a/deps/ox/src/ox/oc/test/CMakeLists.txt +++ b/deps/ox/src/ox/oc/test/CMakeLists.txt @@ -8,6 +8,6 @@ target_link_libraries( OxOrganicClaw ) -add_test("Test\\ OcTest\\ Writer" OcTest OrganicClawWriter) -add_test("Test\\ OcTest\\ Reader" OcTest OrganicClawReader) -add_test("Test\\ OcTest\\ OrganicClawDef" OcTest OrganicClawDef) +add_test("Test OcTest Writer" OcTest OrganicClawWriter) +add_test("Test OcTest Reader" OcTest OrganicClawReader) +add_test("Test OcTest OrganicClawDef" OcTest OrganicClawDef) diff --git a/deps/ox/src/ox/ptrarith/test/CMakeLists.txt b/deps/ox/src/ox/ptrarith/test/CMakeLists.txt index d9c69203..6099f808 100644 --- a/deps/ox/src/ox/ptrarith/test/CMakeLists.txt +++ b/deps/ox/src/ox/ptrarith/test/CMakeLists.txt @@ -8,4 +8,4 @@ target_link_libraries( OxStd ) -add_test("Test\\ PtrArith::setSize" PtrArithTests PtrArith::setSize) +add_test("Test PtrArith::setSize" PtrArithTests PtrArith::setSize) diff --git a/deps/ox/src/ox/std/CMakeLists.txt b/deps/ox/src/ox/std/CMakeLists.txt index 9414f99e..06ebfb97 100644 --- a/deps/ox/src/ox/std/CMakeLists.txt +++ b/deps/ox/src/ox/std/CMakeLists.txt @@ -5,7 +5,6 @@ add_library( byteswap.cpp heapmgr.cpp memops.cpp - new.cpp random.cpp substitutes.cpp stacktrace.cpp diff --git a/deps/ox/src/ox/std/test/CMakeLists.txt b/deps/ox/src/ox/std/test/CMakeLists.txt index 6924c4c6..5e6bc63e 100644 --- a/deps/ox/src/ox/std/test/CMakeLists.txt +++ b/deps/ox/src/ox/std/test/CMakeLists.txt @@ -7,12 +7,12 @@ add_executable( target_link_libraries(StdTest OxStd) -add_test("Test\\ ox_memcmp\\ ABCDEFG\\ !=\\ HIJKLMN" StdTest "ABCDEFG != HIJKLMN") -add_test("Test\\ ox_memcmp\\ HIJKLMN\\ !=\\ ABCDEFG" StdTest "HIJKLMN != ABCDEFG") -add_test("Test\\ ox_memcmp\\ ABCDEFG\\ ==\\ ABCDEFG" StdTest "ABCDEFG == ABCDEFG") -add_test("Test\\ ox_memcmp\\ ABCDEFGHI\\ ==\\ ABCDEFG" StdTest "ABCDEFGHI == ABCDEFG") -add_test("Test\\ BString" StdTest "BString") -add_test("Test\\ String" StdTest "String") -add_test("Test\\ Vector" StdTest "Vector") -add_test("Test\\ HashMap" StdTest "HashMap") -add_test("Test\\ HeapMgr" StdTest malloc) +add_test("Test ox_memcmp ABCDEFG != HIJKLMN" StdTest "ABCDEFG != HIJKLMN") +add_test("Test ox_memcmp HIJKLMN != ABCDEFG" StdTest "HIJKLMN != ABCDEFG") +add_test("Test ox_memcmp ABCDEFG == ABCDEFG" StdTest "ABCDEFG == ABCDEFG") +add_test("Test ox_memcmp ABCDEFGHI == ABCDEFG" StdTest "ABCDEFGHI == ABCDEFG") +add_test("Test BString" StdTest "BString") +add_test("Test String" StdTest "String") +add_test("Test Vector" StdTest "Vector") +add_test("Test HashMap" StdTest "HashMap") +add_test("Test HeapMgr" StdTest malloc)