diff --git a/CMakeLists.txt b/CMakeLists.txt index 5866508..ab9106c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,8 @@ # of this license document, but changing it is not allowed. # -cmake_minimum_required(VERSION 3.1) -project(PotronumMain) +cmake_minimum_required(VERSION 3.10) +project(Patronum) if(TARGET ${PROJECT_NAME}) message("The ${PROJECT_NAME} arledy included in main Project") return() diff --git a/Patronum/CMakeLists.txt b/Patronum/CMakeLists.txt index fe05821..4cd7eb1 100755 --- a/Patronum/CMakeLists.txt +++ b/Patronum/CMakeLists.txt @@ -5,13 +5,8 @@ # of this license document, but changing it is not allowed. # -cmake_minimum_required(VERSION 3.1) - -project(Patronum LANGUAGES CXX) -if(TARGET ${PROJECT_NAME}) - message("The ${PROJECT_NAME} arledy included in main Project") - return() -endif() +cmake_minimum_required(VERSION 3.10) +set(CURRENT_PROJECT ${PROJECT_NAME}) add_subdirectory(qt-solutions/qtservice) add_subdirectory(QuasarAppLib) @@ -36,9 +31,9 @@ file(GLOB SOURCE_CPP ) -add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP}) -target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Core Qt-Service QuasarApp) -target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src") -target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/Private") +add_library(${CURRENT_PROJECT} SHARED ${SOURCE_CPP}) +target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt5::Core Qt-Service QuasarApp) +target_include_directories(${CURRENT_PROJECT} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src") +target_include_directories(${CURRENT_PROJECT} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/Private") setVersion(0 1 0) diff --git a/Patronum/src/Private/IPController.cpp b/Patronum/src/IPController.cpp similarity index 100% rename from Patronum/src/Private/IPController.cpp rename to Patronum/src/IPController.cpp diff --git a/Patronum/src/Private/IPController.h b/Patronum/src/IPController.h similarity index 100% rename from Patronum/src/Private/IPController.h rename to Patronum/src/IPController.h diff --git a/Patronum/src/Private/IPService.cpp b/Patronum/src/IPService.cpp similarity index 100% rename from Patronum/src/Private/IPService.cpp rename to Patronum/src/IPService.cpp diff --git a/Patronum/src/Private/IPService.h b/Patronum/src/IPService.h similarity index 100% rename from Patronum/src/Private/IPService.h rename to Patronum/src/IPService.h diff --git a/Patronum/src/PController.h b/Patronum/src/PController.h index b2d4c4d..d56a9b1 100644 --- a/Patronum/src/PController.h +++ b/Patronum/src/PController.h @@ -1,8 +1,9 @@ #ifndef CONTROLLER_H #define CONTROLLER_H #include "Patronum_global.h" -#include "IPController.h" +#include #include +#include "PFeature.h" namespace Patronum { diff --git a/Patronum/src/PService.h b/Patronum/src/PService.h index e8eec5d..f9bd480 100644 --- a/Patronum/src/PService.h +++ b/Patronum/src/PService.h @@ -2,8 +2,8 @@ #define SERVICE_H #include "Patronum_global.h" #include "PFeature.h" -#include "IPService.h" #include "serviceprivate.h" +#include #include #include