fix build of library

This commit is contained in:
Andrei Yankovich 2020-05-03 20:36:20 +03:00
parent 3ccd5850f2
commit f46dceedc9
8 changed files with 11 additions and 15 deletions

View File

@ -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()

View File

@ -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)

View File

@ -1,8 +1,9 @@
#ifndef CONTROLLER_H
#define CONTROLLER_H
#include "Patronum_global.h"
#include "IPController.h"
#include <IPController.h>
#include <qtservice.h>
#include "PFeature.h"
namespace Patronum {

View File

@ -2,8 +2,8 @@
#define SERVICE_H
#include "Patronum_global.h"
#include "PFeature.h"
#include "IPService.h"
#include "serviceprivate.h"
#include <IPService.h>
#include <qtservice.h>
#include <quasarapp.h>