From e4f1ed4808567e94703e8f6c5f7d6a0a5b91bf9f Mon Sep 17 00:00:00 2001 From: Matthieu Longo Date: Fri, 10 May 2019 22:34:19 +0100 Subject: [PATCH] move headers in subdirectory utf8cpp --- CMakeLists.txt | 2 +- samples/docsample.cpp | 2 +- source/{ => utf8cpp}/utf8.h | 0 source/{ => utf8cpp}/utf8/checked.h | 0 source/{ => utf8cpp}/utf8/core.h | 0 source/{ => utf8cpp}/utf8/cpp11.h | 0 source/{ => utf8cpp}/utf8/unchecked.h | 0 tests/negative.cpp | 2 +- tests/test_checked_api.cpp | 2 +- tests/test_checked_iterator.cpp | 2 +- tests/test_cpp11.cpp | 2 +- tests/test_unchecked_api.cpp | 2 +- tests/test_unchecked_iterator.cpp | 2 +- 13 files changed, 8 insertions(+), 8 deletions(-) rename source/{ => utf8cpp}/utf8.h (100%) rename source/{ => utf8cpp}/utf8/checked.h (100%) rename source/{ => utf8cpp}/utf8/core.h (100%) rename source/{ => utf8cpp}/utf8/cpp11.h (100%) rename source/{ => utf8cpp}/utf8/unchecked.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5da214d..b792113 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ if(UTF8_INSTALL) set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp) endif() - install(DIRECTORY source/ DESTINATION include/utf8cpp) + install(DIRECTORY source/ DESTINATION include) install(TARGETS utf8cpp EXPORT utf8cppConfig) install(EXPORT utf8cppConfig DESTINATION ${DEF_INSTALL_CMAKE_DIR}) endif() diff --git a/samples/docsample.cpp b/samples/docsample.cpp index a758d73..53c981c 100644 --- a/samples/docsample.cpp +++ b/samples/docsample.cpp @@ -1,4 +1,4 @@ -#include "../source/utf8.h" +#include "utf8cpp/utf8.h" #include #include #include diff --git a/source/utf8.h b/source/utf8cpp/utf8.h similarity index 100% rename from source/utf8.h rename to source/utf8cpp/utf8.h diff --git a/source/utf8/checked.h b/source/utf8cpp/utf8/checked.h similarity index 100% rename from source/utf8/checked.h rename to source/utf8cpp/utf8/checked.h diff --git a/source/utf8/core.h b/source/utf8cpp/utf8/core.h similarity index 100% rename from source/utf8/core.h rename to source/utf8cpp/utf8/core.h diff --git a/source/utf8/cpp11.h b/source/utf8cpp/utf8/cpp11.h similarity index 100% rename from source/utf8/cpp11.h rename to source/utf8cpp/utf8/cpp11.h diff --git a/source/utf8/unchecked.h b/source/utf8cpp/utf8/unchecked.h similarity index 100% rename from source/utf8/unchecked.h rename to source/utf8cpp/utf8/unchecked.h diff --git a/tests/negative.cpp b/tests/negative.cpp index f1bcc99..4ba1b91 100644 --- a/tests/negative.cpp +++ b/tests/negative.cpp @@ -1,4 +1,4 @@ -#include "utf8.h" +#include "utf8cpp/utf8.h" using namespace utf8; #include diff --git a/tests/test_checked_api.cpp b/tests/test_checked_api.cpp index 6787da6..e5a69ff 100644 --- a/tests/test_checked_api.cpp +++ b/tests/test_checked_api.cpp @@ -1,5 +1,5 @@ #include "gtest/gtest.h" -#include "utf8.h" +#include "utf8cpp/utf8.h" #include #include diff --git a/tests/test_checked_iterator.cpp b/tests/test_checked_iterator.cpp index 4c44834..54fc8ed 100644 --- a/tests/test_checked_iterator.cpp +++ b/tests/test_checked_iterator.cpp @@ -1,5 +1,5 @@ #include "gtest/gtest.h" -#include "utf8.h" +#include "utf8cpp/utf8.h" using namespace utf8; diff --git a/tests/test_cpp11.cpp b/tests/test_cpp11.cpp index edcff9d..7b630e1 100644 --- a/tests/test_cpp11.cpp +++ b/tests/test_cpp11.cpp @@ -1,5 +1,5 @@ #include "gtest/gtest.h" -#include "utf8.h" +#include "utf8cpp/utf8.h" #include using namespace utf8; using namespace std; diff --git a/tests/test_unchecked_api.cpp b/tests/test_unchecked_api.cpp index e9f19ca..6b316c9 100644 --- a/tests/test_unchecked_api.cpp +++ b/tests/test_unchecked_api.cpp @@ -1,5 +1,5 @@ #include "gtest/gtest.h" -#include "utf8/unchecked.h" +#include "utf8cpp/utf8/unchecked.h" #include #include diff --git a/tests/test_unchecked_iterator.cpp b/tests/test_unchecked_iterator.cpp index 103e8e2..07091ac 100644 --- a/tests/test_unchecked_iterator.cpp +++ b/tests/test_unchecked_iterator.cpp @@ -1,5 +1,5 @@ #include "gtest/gtest.h" -#include "utf8/unchecked.h" +#include "utf8cpp/utf8/unchecked.h" using namespace utf8::unchecked;