4
0
mirror of https://github.com/QuasarApp/CMakeProject.git synced 2025-05-07 10:49:35 +00:00

some fixes
Some checks failed
buildbot/DocsGenerator Build finished.
buildbot/AndroidBuilder_v8Qt6 Build finished.
buildbot/LinuxCMakeBuilderQt6 Build finished.
buildbot/IOSCMakeBuilder Build finished.
buildbot/WindowsCMakeBuilder Build finished.

This commit is contained in:
Andrei Yankovich 2023-10-01 12:30:29 +02:00
parent 65236391b3
commit ae3db6afc3
5 changed files with 7 additions and 11 deletions

View File

@ -58,4 +58,3 @@ endif()
configure_file_in(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) configure_file_in(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/deploy/RENAME_ME.json")

View File

@ -37,5 +37,4 @@ prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE) set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE)
set(global_file "${CMAKE_CURRENT_SOURCE_DIR}/src/public/RENAME_ME/global.h") configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/src/public/RENAME_ME/global.h")
configure_file("${global_file}.in" ${global_file} @ONLY)

View File

@ -10,7 +10,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#define RENAME_ME_VERSION "0.87.648a8dc" #define RENAME_ME_VERSION "0.88.6523639"
#if defined(RENAME_ME_LIBRARY) #if defined(RENAME_ME_LIBRARY)
# define RENAME_ME_EXPORT Q_DECL_EXPORT # define RENAME_ME_EXPORT Q_DECL_EXPORT

View File

@ -100,11 +100,9 @@ else()
# Desctop deploying # Desctop deploying
message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT}) message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT})
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/RENAME_ME.json")
set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/deploy/RENAME_ME.json") addDeployFromCustomFile(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/RENAME_ME.json")
configure_file("${DeployFile}.in" ${DeployFile} @ONLY)
addDeployFromCustomFile("RENAME_ME" ${DeployFile})
endif() endif()

View File

@ -1,7 +1,7 @@
{ {
"bin": [ "bin": [
"src/build/Debug/RENAME_MEEaxample", "src/example/RENAME_ME_example",
"src/build/Debug/RENAME_MEEaxample.exe" "src/example/RENAME_ME_example.exe"
], ],
"clear": true, "clear": true,
"binPrefix": "@CMAKE_BINARY_DIR@", "binPrefix": "@CMAKE_BINARY_DIR@",
@ -21,7 +21,7 @@
], ],
"extraLib": "crypto", "extraLib": "crypto",
"targetDir": "@CMAKE_SOURCE_DIR@/Distro", "targetDir": "@CMAKE_SOURCE_DIR@/Distro",
"deployVersion": "@RENAME_ME_VERSION@", "deployVersion": "@RENAME_ME_VERSION@"
} }