From 6c1cbc9db85a7946dcdd7494b5db61eebee4da41 Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Fri, 23 Apr 2021 20:01:53 -0400 Subject: [PATCH] Optional: Move optional-lite to the include/third-party directory This fixes the use case of adding the include folder manually to an outside project. --- CMakeLists.txt | 4 ---- include/icsneo/platform/optional.h | 2 +- .../icsneo/third-party}/optional-lite/.buckconfig | 0 .../icsneo/third-party}/optional-lite/.editorconfig | 0 .../icsneo/third-party}/optional-lite/.gitattributes | 0 .../icsneo/third-party}/optional-lite/.gitignore | 0 .../icsneo/third-party}/optional-lite/.tgitconfig | 0 .../icsneo/third-party}/optional-lite/.travis.yml | 0 .../icsneo/third-party}/optional-lite/BUCK | 0 .../icsneo/third-party}/optional-lite/CHANGES.txt | 0 .../icsneo/third-party}/optional-lite/CMakeLists.txt | 0 .../icsneo/third-party}/optional-lite/LICENSE.txt | 0 .../icsneo/third-party}/optional-lite/README.md | 0 .../icsneo/third-party}/optional-lite/appveyor.yml | 0 .../optional-lite/cmake/optional-lite-config-version.cmake.in | 0 .../optional-lite/cmake/optional-lite-config.cmake.in | 0 .../icsneo/third-party}/optional-lite/conanfile.py | 0 .../icsneo/third-party}/optional-lite/example/01-to_int.cpp | 0 .../third-party}/optional-lite/example/02-nodefltctor.cpp | 0 .../optional-lite/example/04-any-optional-variant.cpp | 0 .../third-party}/optional-lite/example/05-no-exceptions.cpp | 0 .../icsneo/third-party}/optional-lite/example/BUCK | 0 .../icsneo/third-party}/optional-lite/example/CMakeLists.txt | 0 .../optional-lite/extra/gdb/nonstd_optional_printer.py | 0 .../third-party}/optional-lite/include/nonstd/optional.hpp | 0 .../optional-lite/project/CodeBlocks/optional-lite.cbp | 0 .../optional-lite/project/CodeBlocks/optional-lite.workspace | 0 .../third-party}/optional-lite/script/create-cov-rpt.py | 0 .../icsneo/third-party}/optional-lite/script/create-vcpkg.py | 0 .../third-party}/optional-lite/script/update-version.py | 0 .../icsneo/third-party}/optional-lite/script/upload-conan.py | 0 .../icsneo/third-party}/optional-lite/test/BUCK | 0 .../icsneo/third-party}/optional-lite/test/CMakeLists.txt | 0 .../icsneo/third-party}/optional-lite/test/Makefile | 0 .../icsneo/third-party}/optional-lite/test/lest_cpp03.hpp | 0 .../third-party}/optional-lite/test/nonstd/optional.tweak.hpp | 0 .../third-party}/optional-lite/test/optional-main.t.cpp | 0 .../third-party}/optional-lite/test/optional-main.t.hpp | 0 .../icsneo/third-party}/optional-lite/test/optional.t.cpp | 0 .../icsneo/third-party}/optional-lite/test/t.bat | 0 .../icsneo/third-party}/optional-lite/test/tc-cl.bat | 0 .../icsneo/third-party}/optional-lite/test/tc.bat | 0 .../icsneo/third-party}/optional-lite/test/tg-all.bat | 0 .../icsneo/third-party}/optional-lite/test/tg.bat | 0 44 files changed, 1 insertion(+), 5 deletions(-) rename {third-party => include/icsneo/third-party}/optional-lite/.buckconfig (100%) rename {third-party => include/icsneo/third-party}/optional-lite/.editorconfig (100%) rename {third-party => include/icsneo/third-party}/optional-lite/.gitattributes (100%) rename {third-party => include/icsneo/third-party}/optional-lite/.gitignore (100%) rename {third-party => include/icsneo/third-party}/optional-lite/.tgitconfig (100%) rename {third-party => include/icsneo/third-party}/optional-lite/.travis.yml (100%) rename {third-party => include/icsneo/third-party}/optional-lite/BUCK (100%) rename {third-party => include/icsneo/third-party}/optional-lite/CHANGES.txt (100%) rename {third-party => include/icsneo/third-party}/optional-lite/CMakeLists.txt (100%) rename {third-party => include/icsneo/third-party}/optional-lite/LICENSE.txt (100%) rename {third-party => include/icsneo/third-party}/optional-lite/README.md (100%) rename {third-party => include/icsneo/third-party}/optional-lite/appveyor.yml (100%) rename {third-party => include/icsneo/third-party}/optional-lite/cmake/optional-lite-config-version.cmake.in (100%) rename {third-party => include/icsneo/third-party}/optional-lite/cmake/optional-lite-config.cmake.in (100%) rename {third-party => include/icsneo/third-party}/optional-lite/conanfile.py (100%) rename {third-party => include/icsneo/third-party}/optional-lite/example/01-to_int.cpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/example/02-nodefltctor.cpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/example/04-any-optional-variant.cpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/example/05-no-exceptions.cpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/example/BUCK (100%) rename {third-party => include/icsneo/third-party}/optional-lite/example/CMakeLists.txt (100%) rename {third-party => include/icsneo/third-party}/optional-lite/extra/gdb/nonstd_optional_printer.py (100%) rename {third-party => include/icsneo/third-party}/optional-lite/include/nonstd/optional.hpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/project/CodeBlocks/optional-lite.cbp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/project/CodeBlocks/optional-lite.workspace (100%) rename {third-party => include/icsneo/third-party}/optional-lite/script/create-cov-rpt.py (100%) rename {third-party => include/icsneo/third-party}/optional-lite/script/create-vcpkg.py (100%) rename {third-party => include/icsneo/third-party}/optional-lite/script/update-version.py (100%) rename {third-party => include/icsneo/third-party}/optional-lite/script/upload-conan.py (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/BUCK (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/CMakeLists.txt (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/Makefile (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/lest_cpp03.hpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/nonstd/optional.tweak.hpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/optional-main.t.cpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/optional-main.t.hpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/optional.t.cpp (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/t.bat (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/tc-cl.bat (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/tc.bat (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/tg-all.bat (100%) rename {third-party => include/icsneo/third-party}/optional-lite/test/tg.bat (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9731c51..7045633 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,10 +209,6 @@ if(WIN32) endif() endif(WIN32) -# optional-lite -add_subdirectory(third-party/optional-lite) -target_link_libraries(icsneocpp PUBLIC optional-lite) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") target_link_libraries(icsneocpp PUBLIC "-framework CoreFoundation" "-framework IOKit") endif() diff --git a/include/icsneo/platform/optional.h b/include/icsneo/platform/optional.h index 0fd6d61..f629915 100644 --- a/include/icsneo/platform/optional.h +++ b/include/icsneo/platform/optional.h @@ -1,7 +1,7 @@ #ifndef __ICSNEO_OPTIONAL_H_ #define __ICSNEO_OPTIONAL_H_ -#include "nonstd/optional.hpp" +#include "icsneo/third-party/optional-lite/include/nonstd/optional.hpp" /** * We use icsneo::optional throughout the C++ API to allow for polyfilling diff --git a/third-party/optional-lite/.buckconfig b/include/icsneo/third-party/optional-lite/.buckconfig similarity index 100% rename from third-party/optional-lite/.buckconfig rename to include/icsneo/third-party/optional-lite/.buckconfig diff --git a/third-party/optional-lite/.editorconfig b/include/icsneo/third-party/optional-lite/.editorconfig similarity index 100% rename from third-party/optional-lite/.editorconfig rename to include/icsneo/third-party/optional-lite/.editorconfig diff --git a/third-party/optional-lite/.gitattributes b/include/icsneo/third-party/optional-lite/.gitattributes similarity index 100% rename from third-party/optional-lite/.gitattributes rename to include/icsneo/third-party/optional-lite/.gitattributes diff --git a/third-party/optional-lite/.gitignore b/include/icsneo/third-party/optional-lite/.gitignore similarity index 100% rename from third-party/optional-lite/.gitignore rename to include/icsneo/third-party/optional-lite/.gitignore diff --git a/third-party/optional-lite/.tgitconfig b/include/icsneo/third-party/optional-lite/.tgitconfig similarity index 100% rename from third-party/optional-lite/.tgitconfig rename to include/icsneo/third-party/optional-lite/.tgitconfig diff --git a/third-party/optional-lite/.travis.yml b/include/icsneo/third-party/optional-lite/.travis.yml similarity index 100% rename from third-party/optional-lite/.travis.yml rename to include/icsneo/third-party/optional-lite/.travis.yml diff --git a/third-party/optional-lite/BUCK b/include/icsneo/third-party/optional-lite/BUCK similarity index 100% rename from third-party/optional-lite/BUCK rename to include/icsneo/third-party/optional-lite/BUCK diff --git a/third-party/optional-lite/CHANGES.txt b/include/icsneo/third-party/optional-lite/CHANGES.txt similarity index 100% rename from third-party/optional-lite/CHANGES.txt rename to include/icsneo/third-party/optional-lite/CHANGES.txt diff --git a/third-party/optional-lite/CMakeLists.txt b/include/icsneo/third-party/optional-lite/CMakeLists.txt similarity index 100% rename from third-party/optional-lite/CMakeLists.txt rename to include/icsneo/third-party/optional-lite/CMakeLists.txt diff --git a/third-party/optional-lite/LICENSE.txt b/include/icsneo/third-party/optional-lite/LICENSE.txt similarity index 100% rename from third-party/optional-lite/LICENSE.txt rename to include/icsneo/third-party/optional-lite/LICENSE.txt diff --git a/third-party/optional-lite/README.md b/include/icsneo/third-party/optional-lite/README.md similarity index 100% rename from third-party/optional-lite/README.md rename to include/icsneo/third-party/optional-lite/README.md diff --git a/third-party/optional-lite/appveyor.yml b/include/icsneo/third-party/optional-lite/appveyor.yml similarity index 100% rename from third-party/optional-lite/appveyor.yml rename to include/icsneo/third-party/optional-lite/appveyor.yml diff --git a/third-party/optional-lite/cmake/optional-lite-config-version.cmake.in b/include/icsneo/third-party/optional-lite/cmake/optional-lite-config-version.cmake.in similarity index 100% rename from third-party/optional-lite/cmake/optional-lite-config-version.cmake.in rename to include/icsneo/third-party/optional-lite/cmake/optional-lite-config-version.cmake.in diff --git a/third-party/optional-lite/cmake/optional-lite-config.cmake.in b/include/icsneo/third-party/optional-lite/cmake/optional-lite-config.cmake.in similarity index 100% rename from third-party/optional-lite/cmake/optional-lite-config.cmake.in rename to include/icsneo/third-party/optional-lite/cmake/optional-lite-config.cmake.in diff --git a/third-party/optional-lite/conanfile.py b/include/icsneo/third-party/optional-lite/conanfile.py similarity index 100% rename from third-party/optional-lite/conanfile.py rename to include/icsneo/third-party/optional-lite/conanfile.py diff --git a/third-party/optional-lite/example/01-to_int.cpp b/include/icsneo/third-party/optional-lite/example/01-to_int.cpp similarity index 100% rename from third-party/optional-lite/example/01-to_int.cpp rename to include/icsneo/third-party/optional-lite/example/01-to_int.cpp diff --git a/third-party/optional-lite/example/02-nodefltctor.cpp b/include/icsneo/third-party/optional-lite/example/02-nodefltctor.cpp similarity index 100% rename from third-party/optional-lite/example/02-nodefltctor.cpp rename to include/icsneo/third-party/optional-lite/example/02-nodefltctor.cpp diff --git a/third-party/optional-lite/example/04-any-optional-variant.cpp b/include/icsneo/third-party/optional-lite/example/04-any-optional-variant.cpp similarity index 100% rename from third-party/optional-lite/example/04-any-optional-variant.cpp rename to include/icsneo/third-party/optional-lite/example/04-any-optional-variant.cpp diff --git a/third-party/optional-lite/example/05-no-exceptions.cpp b/include/icsneo/third-party/optional-lite/example/05-no-exceptions.cpp similarity index 100% rename from third-party/optional-lite/example/05-no-exceptions.cpp rename to include/icsneo/third-party/optional-lite/example/05-no-exceptions.cpp diff --git a/third-party/optional-lite/example/BUCK b/include/icsneo/third-party/optional-lite/example/BUCK similarity index 100% rename from third-party/optional-lite/example/BUCK rename to include/icsneo/third-party/optional-lite/example/BUCK diff --git a/third-party/optional-lite/example/CMakeLists.txt b/include/icsneo/third-party/optional-lite/example/CMakeLists.txt similarity index 100% rename from third-party/optional-lite/example/CMakeLists.txt rename to include/icsneo/third-party/optional-lite/example/CMakeLists.txt diff --git a/third-party/optional-lite/extra/gdb/nonstd_optional_printer.py b/include/icsneo/third-party/optional-lite/extra/gdb/nonstd_optional_printer.py similarity index 100% rename from third-party/optional-lite/extra/gdb/nonstd_optional_printer.py rename to include/icsneo/third-party/optional-lite/extra/gdb/nonstd_optional_printer.py diff --git a/third-party/optional-lite/include/nonstd/optional.hpp b/include/icsneo/third-party/optional-lite/include/nonstd/optional.hpp similarity index 100% rename from third-party/optional-lite/include/nonstd/optional.hpp rename to include/icsneo/third-party/optional-lite/include/nonstd/optional.hpp diff --git a/third-party/optional-lite/project/CodeBlocks/optional-lite.cbp b/include/icsneo/third-party/optional-lite/project/CodeBlocks/optional-lite.cbp similarity index 100% rename from third-party/optional-lite/project/CodeBlocks/optional-lite.cbp rename to include/icsneo/third-party/optional-lite/project/CodeBlocks/optional-lite.cbp diff --git a/third-party/optional-lite/project/CodeBlocks/optional-lite.workspace b/include/icsneo/third-party/optional-lite/project/CodeBlocks/optional-lite.workspace similarity index 100% rename from third-party/optional-lite/project/CodeBlocks/optional-lite.workspace rename to include/icsneo/third-party/optional-lite/project/CodeBlocks/optional-lite.workspace diff --git a/third-party/optional-lite/script/create-cov-rpt.py b/include/icsneo/third-party/optional-lite/script/create-cov-rpt.py similarity index 100% rename from third-party/optional-lite/script/create-cov-rpt.py rename to include/icsneo/third-party/optional-lite/script/create-cov-rpt.py diff --git a/third-party/optional-lite/script/create-vcpkg.py b/include/icsneo/third-party/optional-lite/script/create-vcpkg.py similarity index 100% rename from third-party/optional-lite/script/create-vcpkg.py rename to include/icsneo/third-party/optional-lite/script/create-vcpkg.py diff --git a/third-party/optional-lite/script/update-version.py b/include/icsneo/third-party/optional-lite/script/update-version.py similarity index 100% rename from third-party/optional-lite/script/update-version.py rename to include/icsneo/third-party/optional-lite/script/update-version.py diff --git a/third-party/optional-lite/script/upload-conan.py b/include/icsneo/third-party/optional-lite/script/upload-conan.py similarity index 100% rename from third-party/optional-lite/script/upload-conan.py rename to include/icsneo/third-party/optional-lite/script/upload-conan.py diff --git a/third-party/optional-lite/test/BUCK b/include/icsneo/third-party/optional-lite/test/BUCK similarity index 100% rename from third-party/optional-lite/test/BUCK rename to include/icsneo/third-party/optional-lite/test/BUCK diff --git a/third-party/optional-lite/test/CMakeLists.txt b/include/icsneo/third-party/optional-lite/test/CMakeLists.txt similarity index 100% rename from third-party/optional-lite/test/CMakeLists.txt rename to include/icsneo/third-party/optional-lite/test/CMakeLists.txt diff --git a/third-party/optional-lite/test/Makefile b/include/icsneo/third-party/optional-lite/test/Makefile similarity index 100% rename from third-party/optional-lite/test/Makefile rename to include/icsneo/third-party/optional-lite/test/Makefile diff --git a/third-party/optional-lite/test/lest_cpp03.hpp b/include/icsneo/third-party/optional-lite/test/lest_cpp03.hpp similarity index 100% rename from third-party/optional-lite/test/lest_cpp03.hpp rename to include/icsneo/third-party/optional-lite/test/lest_cpp03.hpp diff --git a/third-party/optional-lite/test/nonstd/optional.tweak.hpp b/include/icsneo/third-party/optional-lite/test/nonstd/optional.tweak.hpp similarity index 100% rename from third-party/optional-lite/test/nonstd/optional.tweak.hpp rename to include/icsneo/third-party/optional-lite/test/nonstd/optional.tweak.hpp diff --git a/third-party/optional-lite/test/optional-main.t.cpp b/include/icsneo/third-party/optional-lite/test/optional-main.t.cpp similarity index 100% rename from third-party/optional-lite/test/optional-main.t.cpp rename to include/icsneo/third-party/optional-lite/test/optional-main.t.cpp diff --git a/third-party/optional-lite/test/optional-main.t.hpp b/include/icsneo/third-party/optional-lite/test/optional-main.t.hpp similarity index 100% rename from third-party/optional-lite/test/optional-main.t.hpp rename to include/icsneo/third-party/optional-lite/test/optional-main.t.hpp diff --git a/third-party/optional-lite/test/optional.t.cpp b/include/icsneo/third-party/optional-lite/test/optional.t.cpp similarity index 100% rename from third-party/optional-lite/test/optional.t.cpp rename to include/icsneo/third-party/optional-lite/test/optional.t.cpp diff --git a/third-party/optional-lite/test/t.bat b/include/icsneo/third-party/optional-lite/test/t.bat similarity index 100% rename from third-party/optional-lite/test/t.bat rename to include/icsneo/third-party/optional-lite/test/t.bat diff --git a/third-party/optional-lite/test/tc-cl.bat b/include/icsneo/third-party/optional-lite/test/tc-cl.bat similarity index 100% rename from third-party/optional-lite/test/tc-cl.bat rename to include/icsneo/third-party/optional-lite/test/tc-cl.bat diff --git a/third-party/optional-lite/test/tc.bat b/include/icsneo/third-party/optional-lite/test/tc.bat similarity index 100% rename from third-party/optional-lite/test/tc.bat rename to include/icsneo/third-party/optional-lite/test/tc.bat diff --git a/third-party/optional-lite/test/tg-all.bat b/include/icsneo/third-party/optional-lite/test/tg-all.bat similarity index 100% rename from third-party/optional-lite/test/tg-all.bat rename to include/icsneo/third-party/optional-lite/test/tg-all.bat diff --git a/third-party/optional-lite/test/tg.bat b/include/icsneo/third-party/optional-lite/test/tg.bat similarity index 100% rename from third-party/optional-lite/test/tg.bat rename to include/icsneo/third-party/optional-lite/test/tg.bat