diff --git a/CMakeLists.txt b/CMakeLists.txt index 189854c..2724e32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ project( http_client ) cmake_minimum_required( VERSION 3.0 ) -set (CMAKE_CXX_COMPILER g++) +#set (CMAKE_CXX_COMPILER g++) # Widgets finds its own dependencies. find_package ( Qt5 COMPONENTS Widgets Charts QuickWidgets REQUIRED ) @@ -10,6 +10,9 @@ set ( CMAKE_AUTOMOC ON ) set ( CMAKE_AUTORCC ON ) set ( CMAKE_INCLUDE_CURRENT_DIR ON ) +add_subdirectory(modules/libhttp) +set (http_libs http) + file ( GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp ) file ( GLOB_RECURSE MOC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h* ) @@ -21,4 +24,4 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/include ) add_executable ( http_client ${SOURCES} ${MOC_SRCS} ${UI_HEADERS} ${MOC_HEADERS} ${RESOURCES}) qt5_use_modules ( http_client Widgets Charts Quick ) -target_link_libraries( http_client Qt5::QuickWidgets Qt5::Quick Qt5::Widgets ) +target_link_libraries( http_client ${http_libs} Qt5::QuickWidgets Qt5::Quick Qt5::Widgets ) diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user new file mode 100644 index 0000000..8c4787e --- /dev/null +++ b/CMakeLists.txt.user @@ -0,0 +1,371 @@ + + + + + + EnvironmentId + {49044741-877d-4097-ba83-e04384acf9a3} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {3b40d07b-d16b-4486-8faf-50eeec0a13fc} + 0 + 0 + 0 + + + /home/user/develop/develop/build-QtIntegrationHttpLib-Desktop-u041fu043e u0443u043cu043eu043bu0447u0430u043du0438u044e + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Сборка + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Очистка + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + По умолчанию + По умолчанию + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Debug + + /home/user/develop/develop/build-QtIntegrationHttpLib-Desktop-u041eu0442u043bu0430u0434u043au0430 + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Сборка + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Очистка + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Отладка + Отладка + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Release + + /home/user/develop/develop/build-QtIntegrationHttpLib-Desktop-u0412u044bu043fu0443u0441u043a + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Сборка + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Очистка + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск + Выпуск + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=RelWithDebInfo + + /home/user/develop/develop/build-QtIntegrationHttpLib-Desktop-u0412u044bu043fu0443u0441u043a u0441 u043eu0442u043bu0430u0434u043eu0447u043du043eu0439 u0438u043du0444u043eu0440u043cu0430u0446u0438u0435u0439 + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Сборка + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Очистка + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск с отладочной информацией + Выпуск с отладочной информацией + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=MinSizeRel + + /home/user/develop/develop/build-QtIntegrationHttpLib-Desktop-u0412u044bu043fu0443u0441u043a u043cu0438u043du0438u043cu0430u043bu044cu043du043eu0433u043e u0440u0430u0437u043cu0435u0440u0430 + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Сборка + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + Сборка CMake + + CMakeProjectManager.MakeStep + + 1 + Очистка + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск минимального размера + Выпуск минимального размера + CMakeProjectManager.CMakeBuildConfiguration + + 5 + + + 0 + Установка + + ProjectExplorer.BuildSteps.Deploy + + 1 + Локальная установка + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + -1 + + + + %{buildDir} + Особая программа + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/src/main.cpp b/src/main.cpp index b48f94e..2b4b0a8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,6 @@ #include "mainwindow.h" #include +#include int main(int argc, char *argv[]) {