diff --git a/deps/ox/src/ox/claw/test/CMakeLists.txt b/deps/ox/src/ox/claw/test/CMakeLists.txt index c8ee6900..ddf2ae7e 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("[ox/claw] ClawHeaderReader" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawHeaderReader) -add_test("[ox/claw] ClawHeaderReader2" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawHeaderReader2) -add_test("[ox/claw] ClawWriter" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawWriter) -add_test("[ox/claw] ClawReader" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawReader) +add_test("[ox/claw] ClawHeaderReader" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawHeaderReader) +add_test("[ox/claw] ClawHeaderReader2" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawHeaderReader2) +add_test("[ox/claw] ClawWriter" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawWriter) +add_test("[ox/claw] ClawReader" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawReader) diff --git a/deps/ox/src/ox/event/test/CMakeLists.txt b/deps/ox/src/ox/event/test/CMakeLists.txt index 34e783b1..e6c89917 100644 --- a/deps/ox/src/ox/event/test/CMakeLists.txt +++ b/deps/ox/src/ox/event/test/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable( target_link_libraries(EventTest OxEvent) -add_test("[ox/event] Test 1" ${CMAKE_BINARY_DIR}/bin/EventTest "test1") +add_test("[ox/event] Test 1" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/EventTest "test1") diff --git a/deps/ox/src/ox/fs/test/CMakeLists.txt b/deps/ox/src/ox/fs/test/CMakeLists.txt index 7fa86c30..6b5bb14d 100644 --- a/deps/ox/src/ox/fs/test/CMakeLists.txt +++ b/deps/ox/src/ox/fs/test/CMakeLists.txt @@ -10,20 +10,20 @@ target_link_libraries( OxMetalClaw ) -add_test("[ox/fs] PtrArith::setSize" ${CMAKE_BINARY_DIR}/bin/FSTests PtrArith::setSize) +add_test("[ox/fs] PtrArith::setSize" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PtrArith::setSize) -add_test("[ox/fs] PathIterator::next1" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next1) -add_test("[ox/fs] PathIterator::next2" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next2) -add_test("[ox/fs] PathIterator::next3" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next3) -add_test("[ox/fs] PathIterator::next4" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next4) -add_test("[ox/fs] PathIterator::next5" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next5) -add_test("[ox/fs] PathIterator::hasNext" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::hasNext) +add_test("[ox/fs] PathIterator::next1" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next1) +add_test("[ox/fs] PathIterator::next2" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next2) +add_test("[ox/fs] PathIterator::next3" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next3) +add_test("[ox/fs] PathIterator::next4" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next4) +add_test("[ox/fs] PathIterator::next5" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next5) +add_test("[ox/fs] PathIterator::hasNext" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::hasNext) -add_test("[ox/fs] PathIterator::dirPath" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::dirPath) -add_test("[ox/fs] PathIterator::fileName" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::fileName) +add_test("[ox/fs] PathIterator::dirPath" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::dirPath) +add_test("[ox/fs] PathIterator::fileName" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::fileName) -add_test("[ox/fs] NodeBuffer::insert" ${CMAKE_BINARY_DIR}/bin/FSTests "NodeBuffer::insert") -add_test("[ox/fs] FileStore::readWrite" ${CMAKE_BINARY_DIR}/bin/FSTests "FileStore::readWrite") +add_test("[ox/fs] NodeBuffer::insert" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "NodeBuffer::insert") +add_test("[ox/fs] FileStore::readWrite" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "FileStore::readWrite") -add_test("[ox/fs] Directory" ${CMAKE_BINARY_DIR}/bin/FSTests "Directory") -add_test("[ox/fs] FileSystem" ${CMAKE_BINARY_DIR}/bin/FSTests "FileSystem") +add_test("[ox/fs] Directory" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "Directory") +add_test("[ox/fs] FileSystem" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "FileSystem") diff --git a/deps/ox/src/ox/mc/test/CMakeLists.txt b/deps/ox/src/ox/mc/test/CMakeLists.txt index 5547e05c..f7ffb4d8 100644 --- a/deps/ox/src/ox/mc/test/CMakeLists.txt +++ b/deps/ox/src/ox/mc/test/CMakeLists.txt @@ -8,9 +8,9 @@ target_link_libraries( OxMetalClaw ) -add_test("[ox/mc] Writer" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawWriter) -add_test("[ox/mc] Reader" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawReader) -#add_test("[ox/mc] MetalClawDef" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawDef) -add_test("[ox/mc] MetalClawModelValue" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawModelValue) -add_test("[ox/mc] encodeInteger" ${CMAKE_BINARY_DIR}/bin/McTest encodeInteger) -add_test("[ox/mc] decodeInteger" ${CMAKE_BINARY_DIR}/bin/McTest decodeInteger) +add_test("[ox/mc] Writer" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawWriter) +add_test("[ox/mc] Reader" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawReader) +#add_test("[ox/mc] MetalClawDef" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawDef) +add_test("[ox/mc] MetalClawModelValue" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawModelValue) +add_test("[ox/mc] encodeInteger" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest encodeInteger) +add_test("[ox/mc] decodeInteger" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest decodeInteger) diff --git a/deps/ox/src/ox/model/test/CMakeLists.txt b/deps/ox/src/ox/model/test/CMakeLists.txt index d9dc1bc2..8ec4bbf6 100644 --- a/deps/ox/src/ox/model/test/CMakeLists.txt +++ b/deps/ox/src/ox/model/test/CMakeLists.txt @@ -8,6 +8,6 @@ target_link_libraries( OxModel ) -add_test("[ox/model] ModelValue" ${CMAKE_BINARY_DIR}/bin/ModelTest ModelValue) -add_test("[ox/model] getModelTypeName" ${CMAKE_BINARY_DIR}/bin/ModelTest getModelTypeName) -add_test("[ox/model] getModelTypeVersion" ${CMAKE_BINARY_DIR}/bin/ModelTest getModelTypeVersion) +add_test("[ox/model] ModelValue" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ModelTest ModelValue) +add_test("[ox/model] getModelTypeName" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ModelTest getModelTypeName) +add_test("[ox/model] getModelTypeVersion" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ModelTest getModelTypeVersion) diff --git a/deps/ox/src/ox/oc/test/CMakeLists.txt b/deps/ox/src/ox/oc/test/CMakeLists.txt index 71602416..d57a00ba 100644 --- a/deps/ox/src/ox/oc/test/CMakeLists.txt +++ b/deps/ox/src/ox/oc/test/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries( OxOrganicClaw ) -add_test("[ox/oc] Writer" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawWriter) -add_test("[ox/oc] Reader" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawReader) -add_test("[ox/oc] OrganicClawModelValue" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawModelValue) -add_test("[ox/oc] OrganicClawDef" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawDef) +add_test("[ox/oc] Writer" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OcTest OrganicClawWriter) +add_test("[ox/oc] Reader" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OcTest OrganicClawReader) +add_test("[ox/oc] OrganicClawModelValue" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OcTest OrganicClawModelValue) +add_test("[ox/oc] OrganicClawDef" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OcTest OrganicClawDef) diff --git a/deps/ox/src/ox/std/test/CMakeLists.txt b/deps/ox/src/ox/std/test/CMakeLists.txt index 9cd63a14..d0c7da23 100644 --- a/deps/ox/src/ox/std/test/CMakeLists.txt +++ b/deps/ox/src/ox/std/test/CMakeLists.txt @@ -7,20 +7,20 @@ add_executable( target_link_libraries(StdTest OxStd) -add_test("[ox/std] ox_memcmp ABCDEFG != HIJKLMN" ${CMAKE_BINARY_DIR}/bin/StdTest "ABCDEFG != HIJKLMN") -add_test("[ox/std] ox_memcmp HIJKLMN != ABCDEFG" ${CMAKE_BINARY_DIR}/bin/StdTest "HIJKLMN != ABCDEFG") -add_test("[ox/std] ox_memcmp ABCDEFG == ABCDEFG" ${CMAKE_BINARY_DIR}/bin/StdTest "ABCDEFG == ABCDEFG") -add_test("[ox/std] ox_memcmp ABCDEFGHI == ABCDEFG" ${CMAKE_BINARY_DIR}/bin/StdTest "ABCDEFGHI == ABCDEFG") -add_test("[ox/std] itoa" ${CMAKE_BINARY_DIR}/bin/StdTest "itoa") -add_test("[ox/std] BString" ${CMAKE_BINARY_DIR}/bin/StdTest "BString") -add_test("[ox/std] String" ${CMAKE_BINARY_DIR}/bin/StdTest "String") -add_test("[ox/std] Vector" ${CMAKE_BINARY_DIR}/bin/StdTest "Vector") -add_test("[ox/std] HashMap" ${CMAKE_BINARY_DIR}/bin/StdTest "HashMap") -add_test("[ox/std] HeapMgr" ${CMAKE_BINARY_DIR}/bin/StdTest malloc) -add_test("[ox/std] Serialize-Int" ${CMAKE_BINARY_DIR}/bin/StdTest "Serialize-Int") -add_test("[ox/std] BufferWriter" ${CMAKE_BINARY_DIR}/bin/StdTest "BufferWriter") -add_test("[ox/std] StringSplit" ${CMAKE_BINARY_DIR}/bin/StdTest "StringSplit") -add_test("[ox/std] FromHex" ${CMAKE_BINARY_DIR}/bin/StdTest "FromHex") -add_test("[ox/std] ToHex" ${CMAKE_BINARY_DIR}/bin/StdTest "ToHex") -add_test("[ox/std] UUID" ${CMAKE_BINARY_DIR}/bin/StdTest "UUID") -add_test("[ox/std] UUID::generate" ${CMAKE_BINARY_DIR}/bin/StdTest "UUID::generate") +add_test("[ox/std] ox_memcmp ABCDEFG != HIJKLMN" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "ABCDEFG != HIJKLMN") +add_test("[ox/std] ox_memcmp HIJKLMN != ABCDEFG" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "HIJKLMN != ABCDEFG") +add_test("[ox/std] ox_memcmp ABCDEFG == ABCDEFG" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "ABCDEFG == ABCDEFG") +add_test("[ox/std] ox_memcmp ABCDEFGHI == ABCDEFG" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "ABCDEFGHI == ABCDEFG") +add_test("[ox/std] itoa" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "itoa") +add_test("[ox/std] BString" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "BString") +add_test("[ox/std] String" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "String") +add_test("[ox/std] Vector" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Vector") +add_test("[ox/std] HashMap" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "HashMap") +add_test("[ox/std] HeapMgr" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest malloc) +add_test("[ox/std] Serialize-Int" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Serialize-Int") +add_test("[ox/std] BufferWriter" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "BufferWriter") +add_test("[ox/std] StringSplit" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "StringSplit") +add_test("[ox/std] FromHex" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "FromHex") +add_test("[ox/std] ToHex" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "ToHex") +add_test("[ox/std] UUID" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "UUID") +add_test("[ox/std] UUID::generate" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "UUID::generate")