Get rid of extra 'ftp' folder in src and include directories

deniskovalchuk · Sep 4, 2023 · 361fd4b · 361fd4b
1 parent d146f58
commit 361fd4b
Show file tree

Hide file tree

Showing 33 changed files with 28 additions and 29 deletions.
diff --git a/src/ftp/include/ftp/client.hpp → include/ftp/client.hpp b/src/ftp/include/ftp/client.hpp → include/ftp/client.hpp
diff --git a/src/ftp/include/ftp/detail/ascii_istream.hpp → include/ftp/detail/ascii_istream.hpp b/src/ftp/include/ftp/detail/ascii_istream.hpp → include/ftp/detail/ascii_istream.hpp
diff --git a/src/ftp/include/ftp/detail/ascii_ostream.hpp → include/ftp/detail/ascii_ostream.hpp b/src/ftp/include/ftp/detail/ascii_ostream.hpp → include/ftp/detail/ascii_ostream.hpp
diff --git a/...ftp/include/ftp/detail/binary_istream.hpp → include/ftp/detail/binary_istream.hpp b/...ftp/include/ftp/detail/binary_istream.hpp → include/ftp/detail/binary_istream.hpp
diff --git a/...ftp/include/ftp/detail/binary_ostream.hpp → include/ftp/detail/binary_ostream.hpp b/...ftp/include/ftp/detail/binary_ostream.hpp → include/ftp/detail/binary_ostream.hpp
diff --git a/...include/ftp/detail/control_connection.hpp → include/ftp/detail/control_connection.hpp b/...include/ftp/detail/control_connection.hpp → include/ftp/detail/control_connection.hpp
diff --git a/...tp/include/ftp/detail/data_connection.hpp → include/ftp/detail/data_connection.hpp b/...tp/include/ftp/detail/data_connection.hpp → include/ftp/detail/data_connection.hpp
diff --git a/src/ftp/include/ftp/detail/utils.hpp → include/ftp/detail/utils.hpp b/src/ftp/include/ftp/detail/utils.hpp → include/ftp/detail/utils.hpp
diff --git a/src/ftp/include/ftp/ftp_exception.hpp → include/ftp/ftp_exception.hpp b/src/ftp/include/ftp/ftp_exception.hpp → include/ftp/ftp_exception.hpp
diff --git a/src/ftp/include/ftp/observer.hpp → include/ftp/observer.hpp b/src/ftp/include/ftp/observer.hpp → include/ftp/observer.hpp
diff --git a/src/ftp/include/ftp/replies.hpp → include/ftp/replies.hpp b/src/ftp/include/ftp/replies.hpp → include/ftp/replies.hpp
diff --git a/src/ftp/include/ftp/reply.hpp → include/ftp/reply.hpp b/src/ftp/include/ftp/reply.hpp → include/ftp/reply.hpp
diff --git a/src/ftp/include/ftp/stream/input_stream.hpp → include/ftp/stream/input_stream.hpp b/src/ftp/include/ftp/stream/input_stream.hpp → include/ftp/stream/input_stream.hpp
diff --git a/...tp/include/ftp/stream/istream_adapter.hpp → include/ftp/stream/istream_adapter.hpp b/...tp/include/ftp/stream/istream_adapter.hpp → include/ftp/stream/istream_adapter.hpp
diff --git a/...tp/include/ftp/stream/ostream_adapter.hpp → include/ftp/stream/ostream_adapter.hpp b/...tp/include/ftp/stream/ostream_adapter.hpp → include/ftp/stream/ostream_adapter.hpp
diff --git a/src/ftp/include/ftp/stream/output_stream.hpp → include/ftp/stream/output_stream.hpp b/src/ftp/include/ftp/stream/output_stream.hpp → include/ftp/stream/output_stream.hpp
diff --git a/src/ftp/include/ftp/transfer_callback.hpp → include/ftp/transfer_callback.hpp b/src/ftp/include/ftp/transfer_callback.hpp → include/ftp/transfer_callback.hpp
diff --git a/src/ftp/include/ftp/transfer_mode.hpp → include/ftp/transfer_mode.hpp b/src/ftp/include/ftp/transfer_mode.hpp → include/ftp/transfer_mode.hpp
diff --git a/src/ftp/include/ftp/transfer_type.hpp → include/ftp/transfer_type.hpp b/src/ftp/include/ftp/transfer_type.hpp → include/ftp/transfer_type.hpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1 +1,28 @@
-add_subdirectory(ftp)
+project(ftp LANGUAGES CXX)
+
+add_library(${PROJECT_NAME}
+        STATIC
+        client.cpp
+        control_connection.cpp
+        data_connection.cpp
+        replies.cpp
+        reply.cpp
+        utils.cpp
+        ascii_istream.cpp
+        ascii_ostream.cpp
+        binary_istream.cpp
+        binary_ostream.cpp
+        istream_adapter.cpp
+        ostream_adapter.cpp)
+
+find_package(Boost 1.67.0 REQUIRED)
+
+target_link_libraries(${PROJECT_NAME} PUBLIC Boost::boost)
+
+target_include_directories(${PROJECT_NAME}
+        PRIVATE
+        ../include)
+
+target_include_directories(${PROJECT_NAME}
+        PUBLIC
+        ../include)
diff --git a/src/ftp/src/ascii_istream.cpp → src/ascii_istream.cpp b/src/ftp/src/ascii_istream.cpp → src/ascii_istream.cpp
diff --git a/src/ftp/src/ascii_ostream.cpp → src/ascii_ostream.cpp b/src/ftp/src/ascii_ostream.cpp → src/ascii_ostream.cpp
diff --git a/src/ftp/src/binary_istream.cpp → src/binary_istream.cpp b/src/ftp/src/binary_istream.cpp → src/binary_istream.cpp
diff --git a/src/ftp/src/binary_ostream.cpp → src/binary_ostream.cpp b/src/ftp/src/binary_ostream.cpp → src/binary_ostream.cpp
diff --git a/src/ftp/src/client.cpp → src/client.cpp b/src/ftp/src/client.cpp → src/client.cpp
diff --git a/src/ftp/src/control_connection.cpp → src/control_connection.cpp b/src/ftp/src/control_connection.cpp → src/control_connection.cpp
diff --git a/src/ftp/src/data_connection.cpp → src/data_connection.cpp b/src/ftp/src/data_connection.cpp → src/data_connection.cpp
diff --git a/src/ftp/CMakeLists.txt b/src/ftp/CMakeLists.txt
diff --git a/src/ftp/src/istream_adapter.cpp → src/istream_adapter.cpp b/src/ftp/src/istream_adapter.cpp → src/istream_adapter.cpp
diff --git a/src/ftp/src/ostream_adapter.cpp → src/ostream_adapter.cpp b/src/ftp/src/ostream_adapter.cpp → src/ostream_adapter.cpp
diff --git a/src/ftp/src/replies.cpp → src/replies.cpp b/src/ftp/src/replies.cpp → src/replies.cpp
diff --git a/src/ftp/src/reply.cpp → src/reply.cpp b/src/ftp/src/reply.cpp → src/reply.cpp
diff --git a/src/ftp/src/utils.cpp → src/utils.cpp b/src/ftp/src/utils.cpp → src/utils.cpp