QuasarApp/qTbot
4
1
Fork 0
mirror of https://github.com/QuasarApp/qTbot.git synced 2025-04-26 05:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix configuration files

Browse Source
This commit is contained in:
Andrei Yankovich 2023-10-01 11:46:08 +02:00
parent efa3b97211
commit 4c1bfe5aa7
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -46,7 +46,7 @@ initAll()
add_subdirectory(src/qTbot)
if (DEFINED QTBOT_EXAMPLE)
if (QTBOT_EXAMPLE)
add_subdirectory(src/example)
endif()

13
src/example/CMakeLists.txt
View File

@ -69,11 +69,8 @@ if (ANDROID)
"${qTbot_EXTRA_LIBS}")
endif()
set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml")
configure_file("${manifest_file}.in" ${manifest_file} @ONLY)
set(gradle_file "${CMAKE_CURRENT_SOURCE_DIR}/android/build.gradle")
configure_file("${gradle_file}.in" ${gradle_file} @ONLY)
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml" @ONLY)
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/android/build.gradle" @ONLY)
file(GLOB java_files
"android/src/com/quasarapp/androidtools/*.java"
@ -101,10 +98,8 @@ else()
message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT})
set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/deploy/qTbot.json")
configure_file("${DeployFile}.in" ${DeployFile} @ONLY)
addDeployFromCustomFile("qTbot" ${DeployFile})
set(DeployFile )
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/qTbot.json" @ONLY)
endif()

3
src/qTbot/CMakeLists.txt
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(global_file "${CMAKE_CURRENT_SOURCE_DIR}/src/public/qTbot/global.h")
configure_file("${global_file}.in" ${global_file} @ONLY)
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/src/public/qTbot/global.h")

2
src/qTbot/src/public/qTbot/global.h
View File

@ -10,7 +10,7 @@
#include <QtCore/qglobal.h>
#define QTBOT_VERSION "0.28.fa99f10"
#define QTBOT_VERSION "0.30.efa3b97"
#if defined(QTBOT_LIBRARY)
# define QTBOT_EXPORT Q_DECL_EXPORT