mirror of
https://github.com/QuasarApp/Patronum.git
synced 2025-04-28 16:44:31 +00:00
fix build of library
This commit is contained in:
parent
3ccd5850f2
commit
f46dceedc9
@ -5,8 +5,8 @@
|
|||||||
# of this license document, but changing it is not allowed.
|
# of this license document, but changing it is not allowed.
|
||||||
#
|
#
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.1)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
project(PotronumMain)
|
project(Patronum)
|
||||||
if(TARGET ${PROJECT_NAME})
|
if(TARGET ${PROJECT_NAME})
|
||||||
message("The ${PROJECT_NAME} arledy included in main Project")
|
message("The ${PROJECT_NAME} arledy included in main Project")
|
||||||
return()
|
return()
|
||||||
|
@ -5,13 +5,8 @@
|
|||||||
# of this license document, but changing it is not allowed.
|
# of this license document, but changing it is not allowed.
|
||||||
#
|
#
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.1)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
|
set(CURRENT_PROJECT ${PROJECT_NAME})
|
||||||
project(Patronum LANGUAGES CXX)
|
|
||||||
if(TARGET ${PROJECT_NAME})
|
|
||||||
message("The ${PROJECT_NAME} arledy included in main Project")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory(qt-solutions/qtservice)
|
add_subdirectory(qt-solutions/qtservice)
|
||||||
add_subdirectory(QuasarAppLib)
|
add_subdirectory(QuasarAppLib)
|
||||||
@ -36,9 +31,9 @@ file(GLOB SOURCE_CPP
|
|||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP})
|
add_library(${CURRENT_PROJECT} SHARED ${SOURCE_CPP})
|
||||||
target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Core Qt-Service QuasarApp)
|
target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt5::Core Qt-Service QuasarApp)
|
||||||
target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
|
target_include_directories(${CURRENT_PROJECT} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/Private")
|
target_include_directories(${CURRENT_PROJECT} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/Private")
|
||||||
|
|
||||||
setVersion(0 1 0)
|
setVersion(0 1 0)
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
#ifndef CONTROLLER_H
|
#ifndef CONTROLLER_H
|
||||||
#define CONTROLLER_H
|
#define CONTROLLER_H
|
||||||
#include "Patronum_global.h"
|
#include "Patronum_global.h"
|
||||||
#include "IPController.h"
|
#include <IPController.h>
|
||||||
#include <qtservice.h>
|
#include <qtservice.h>
|
||||||
|
#include "PFeature.h"
|
||||||
|
|
||||||
namespace Patronum {
|
namespace Patronum {
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
#define SERVICE_H
|
#define SERVICE_H
|
||||||
#include "Patronum_global.h"
|
#include "Patronum_global.h"
|
||||||
#include "PFeature.h"
|
#include "PFeature.h"
|
||||||
#include "IPService.h"
|
|
||||||
#include "serviceprivate.h"
|
#include "serviceprivate.h"
|
||||||
|
#include <IPService.h>
|
||||||
#include <qtservice.h>
|
#include <qtservice.h>
|
||||||
#include <quasarapp.h>
|
#include <quasarapp.h>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user