diff --git a/CMakeLists.txt b/CMakeLists.txt index 75b9848..68732de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,3 +31,4 @@ endif() initAll() addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) +addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json") diff --git a/Deploy/RENAME_ME.json b/Deploy/RENAME_ME.json new file mode 100644 index 0000000..5d10393 --- /dev/null +++ b/Deploy/RENAME_ME.json @@ -0,0 +1,19 @@ +{ + "binDir": "./../src/build/Debug/RENAME_MEEaxample", + "clear": true, + "libDir": "./../", + "recursiveDepth": "10", + "deploySystem": false, + "qmlDir": "../", + "ignoreEnv": [ + "./../installer", + "./../Distro", + "./../parts", + "./../snap", + "./../prime", + "./../stage" + ], + "extraLib": "crypto", + "targetDir": "./../DisttibutionKit" +} + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 60c6ff5..4cb9d7e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,8 +7,7 @@ cmake_minimum_required(VERSION 3.14) -include(../CMake/ProjectOut.cmake) -include(../CMake/Version.cmake) + set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) @@ -18,31 +17,9 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -add_definitions(-DRENAME_ME_LIBRARY) +include(../CMake/ProjectOut.cmake) +include(../CMake/Version.cmake) +include(../CMake/tr.cmake) - -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) - -file(GLOB SOURCE_CPP - "*.cpp" "*.qrc" - "src/*.cpp" "src/*.qrc" - "src/Private/*.cpp" "src/Private/*.qrc" -) - -set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") -set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src") -set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Private") - - -add_library(${PROJECT_NAME} ${SOURCE_CPP}) - -if (${QT_VERSION_MAJOR}) - target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core) -endif() - -target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR}) -target_include_directories(${PROJECT_NAME} PRIVATE ${PRIVATE_INCUDE_DIR}) - - -setVersion(0 0 1) +add_subdirectory(Library) +add_subdirectory(Example) diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt new file mode 100644 index 0000000..79612d6 --- /dev/null +++ b/src/Example/CMakeLists.txt @@ -0,0 +1,36 @@ +# +# Copyright (C) 2021-2021 QuasarApp. +# Distributed under the lgplv3 software license, see the accompanying +# Everyone is permitted to copy and distribute verbatim copies +# of this license document, but changing it is not allowed. +# + +cmake_minimum_required(VERSION 3.14) + +set(CURRENT_PROJECT "${PROJECT_NAME}Eaxample") + + +find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) + +file(GLOB SOURCE_CPP + "*.cpp" "*.qrc" + "src/*.cpp" "src/*.qrc" + "src/Private/*.cpp" "src/Private/*.qrc" +) + +set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src") +set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Private") + +add_executable(${CURRENT_PROJECT} ${SOURCE_CPP}) + +if (${QT_VERSION_MAJOR}) + target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt::Core) +endif() +target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}) + +target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) +target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR}) + + diff --git a/src/Example/src/main.cpp b/src/Example/src/main.cpp new file mode 100644 index 0000000..f3f95a6 --- /dev/null +++ b/src/Example/src/main.cpp @@ -0,0 +1,10 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +int main(int argc, char *argv[]) { + return 0; +} diff --git a/src/Library/CMakeLists.txt b/src/Library/CMakeLists.txt new file mode 100644 index 0000000..250fccf --- /dev/null +++ b/src/Library/CMakeLists.txt @@ -0,0 +1,44 @@ +# +# Copyright (C) 2020-2021 QuasarApp. +# Distributed under the lgplv3 software license, see the accompanying +# Everyone is permitted to copy and distribute verbatim copies +# of this license document, but changing it is not allowed. +# + +cmake_minimum_required(VERSION 3.14) + +add_definitions(-DRENAME_ME_LIBRARY) + + +find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) + +file(GLOB SOURCE_CPP + "*.cpp" "*.qrc" + "src/*.cpp" "src/*.qrc" + "src/Private/*.cpp" "src/Private/*.qrc" +) + +set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src") +set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Private") + + +add_library(${PROJECT_NAME} ${SOURCE_CPP}) + +if (${QT_VERSION_MAJOR}) + target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core) +endif() + +target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR}) +target_include_directories(${PROJECT_NAME} PRIVATE ${PRIVATE_INCUDE_DIR}) + +set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts) + + +prepareQM(${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") + +setVersion(0 0 1) + +set(QML_IMPORT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "Qt Creator extra qml import paths") + diff --git a/src/Library/languages/en.ts b/src/Library/languages/en.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Library/languages/en.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Library/src/RENAME_ME.cpp b/src/Library/src/RENAME_ME.cpp new file mode 100644 index 0000000..8c5f4c3 --- /dev/null +++ b/src/Library/src/RENAME_ME.cpp @@ -0,0 +1,19 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#include "RENAME_ME.h" + + +namespace RENAME_ME { + +bool init() { + initRENAME_MEResources(); + return true; +} + + +} diff --git a/src/Library/src/RENAME_ME.h b/src/Library/src/RENAME_ME.h new file mode 100644 index 0000000..041d4b8 --- /dev/null +++ b/src/Library/src/RENAME_ME.h @@ -0,0 +1,17 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#include "RENAME_ME_global.h" + +namespace RENAME_ME { + +inline void initRENAME_MEResources() { Q_INIT_RESOURCE(RENAME_ME); } + + +bool RENAME_ME_EXPORT init(); + +}; diff --git a/src/Library/src/RENAME_ME.qrc b/src/Library/src/RENAME_ME.qrc new file mode 100644 index 0000000..2c2d544 --- /dev/null +++ b/src/Library/src/RENAME_ME.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>RENAME_MEModule/qmldir</file> + <file>RENAME_MEModule/RENAME_ME.qml</file> + </qresource> +</RCC> diff --git a/src/Library/src/RENAME_MEModule/RENAME_ME.qml b/src/Library/src/RENAME_MEModule/RENAME_ME.qml new file mode 100644 index 0000000..95b8b53 --- /dev/null +++ b/src/Library/src/RENAME_MEModule/RENAME_ME.qml @@ -0,0 +1,12 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +import QtQuick 2.15 + +Item { + +} diff --git a/src/Library/src/RENAME_MEModule/qmldir b/src/Library/src/RENAME_MEModule/qmldir new file mode 100644 index 0000000..897fe9d --- /dev/null +++ b/src/Library/src/RENAME_MEModule/qmldir @@ -0,0 +1,3 @@ +module QuasarAppCreditsModule +RENAME_ME 1.0 RENAME_ME.qml + diff --git a/src/Library/src/RENAME_ME_global.h b/src/Library/src/RENAME_ME_global.h new file mode 100644 index 0000000..ae8a813 --- /dev/null +++ b/src/Library/src/RENAME_ME_global.h @@ -0,0 +1,20 @@ +//# +//# Copyright (C) 2018-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#ifndef RENAME_ME_GLOBAL_H +#define RENAME_ME_GLOBAL_H + +#include <QtCore/qglobal.h> + +#if defined(RENAME_ME_LIBRARY) +# define RENAME_ME_EXPORT Q_DECL_EXPORT +#else +# define RENAME_ME_EXPORT Q_DECL_IMPORT +#endif + +#endif //RENAME_ME_GLOBAL_H + diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cdf646d..c82cf56 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,7 +29,7 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units") add_executable(${CURRENT_PROJECT} ${SOURCE_CPP}) -target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt::Test) +target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt::Test RENAME_ME) target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})