mirror of
https://github.com/QuasarApp/CMakeProject.git
synced 2025-05-04 17:29:35 +00:00
fix deploy
This commit is contained in:
parent
30bab987a5
commit
09b4c91510
@ -6,7 +6,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.14)
|
cmake_minimum_required(VERSION 3.14)
|
||||||
project(RENAME_ME)
|
project(RENAME_ME LANGUAGES CXX)
|
||||||
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()
|
||||||
|
@ -47,65 +47,65 @@ target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME})
|
|||||||
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
|
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
|
||||||
target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
|
target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
|
||||||
|
|
||||||
if (${QT_VERSION_MAJOR})
|
SET(TARGET_DIR "${CMAKE_SOURCE_DIR}/Distro")
|
||||||
SET(TARGET_DIR "${CMAKE_SOURCE_DIR}/Distro")
|
file(MAKE_DIRECTORY ${TARGET_DIR})
|
||||||
file(MAKE_DIRECTORY ${TARGET_DIR})
|
|
||||||
|
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
|
|
||||||
set(SNAKE_EXTRA_LIBS
|
|
||||||
${CURRENT_PROJECT}
|
|
||||||
# libName
|
|
||||||
)
|
|
||||||
|
|
||||||
# find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
|
|
||||||
# target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
|
|
||||||
|
|
||||||
addDeployAPK(${CURRENT_PROJECT}
|
|
||||||
"${CMAKE_CURRENT_LIST_DIR}/android"
|
|
||||||
"QuasarAppProject"
|
|
||||||
"${SIGPATH}/quasarapp.keystore"
|
|
||||||
"${SIGPASS_QUASARAPP}"
|
|
||||||
"${TARGET_DIR}"
|
|
||||||
"${SNAKE_EXTRA_LIBS}")
|
|
||||||
|
|
||||||
|
|
||||||
file(GLOB java_files
|
|
||||||
"android/src/com/quasarapp/androidtools/*.java"
|
|
||||||
"android/*.xml"
|
|
||||||
"android/*.gradle"
|
|
||||||
"android/gradlew"
|
|
||||||
"android/gradle.*"
|
|
||||||
|
|
||||||
|
set(SNAKE_EXTRA_LIBS
|
||||||
|
${CURRENT_PROJECT}
|
||||||
|
# libName
|
||||||
)
|
)
|
||||||
|
|
||||||
add_custom_target(${name}Android
|
# find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
|
||||||
SOURCES ${java_files}
|
# target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
|
||||||
)
|
|
||||||
|
|
||||||
else()
|
addDeployAPK(${CURRENT_PROJECT}
|
||||||
# Desctop deploying
|
"${CMAKE_CURRENT_LIST_DIR}/android"
|
||||||
addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json")
|
"QuasarAppProject"
|
||||||
|
"${SIGPATH}/quasarapp.keystore"
|
||||||
|
"${SIGPASS_QUASARAPP}"
|
||||||
|
"${TARGET_DIR}"
|
||||||
|
"${SNAKE_EXTRA_LIBS}")
|
||||||
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(QT_VERSION_MAJOR EQUAL 6)
|
file(GLOB java_files
|
||||||
qt_import_qml_plugins(${CURRENT_PROJECT})
|
"android/src/com/quasarapp/androidtools/*.java"
|
||||||
qt_finalize_executable(${CURRENT_PROJECT})
|
"android/*.xml"
|
||||||
endif()
|
"android/*.gradle"
|
||||||
|
"android/gradlew"
|
||||||
|
"android/gradle.*"
|
||||||
|
|
||||||
set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
|
)
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts)
|
|
||||||
|
|
||||||
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
|
add_custom_target(${name}Android
|
||||||
|
SOURCES ${java_files}
|
||||||
|
)
|
||||||
|
|
||||||
|
else()
|
||||||
|
# Desctop deploying
|
||||||
|
addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/../../Deploy/RENAME_ME.json")
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(QT_VERSION_MAJOR EQUAL 6)
|
||||||
|
# Add This line if your project use the Quick module
|
||||||
|
# qt_import_qml_plugins(${CURRENT_PROJECT})
|
||||||
|
qt_finalize_executable(${CURRENT_PROJECT})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts)
|
||||||
|
|
||||||
|
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/private")
|
|||||||
add_library(${PROJECT_NAME} ${SOURCE_CPP} ${SOURCE_QRC})
|
add_library(${PROJECT_NAME} ${SOURCE_CPP} ${SOURCE_QRC})
|
||||||
|
|
||||||
if (${QT_VERSION_MAJOR})
|
if (${QT_VERSION_MAJOR})
|
||||||
target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core)
|
target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR})
|
target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user