From c82c16f37304e34e8a2ac2b4d945176c06af5f1b Mon Sep 17 00:00:00 2001 From: EndrII <EndrIIMail@gmail.com> Date: Thu, 9 Sep 2021 19:32:03 +0300 Subject: [PATCH] fix build --- CMakeLists.txt | 7 ++----- src/Example/CMakeLists.txt | 2 +- src/Example/languages/de.ts | 4 ++++ src/Example/languages/en.ts | 1 - src/Example/languages/es.ts | 4 ++++ src/Example/languages/fr.ts | 4 ++++ src/Example/languages/ja.ts | 4 ++++ src/Example/languages/pl.ts | 4 ++++ src/Example/languages/ru.ts | 4 ++++ src/Example/languages/tr.ts | 4 ++++ src/Example/languages/uk.ts | 4 ++++ src/Example/languages/zh.ts | 4 ++++ 12 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/Example/languages/de.ts create mode 100644 src/Example/languages/es.ts create mode 100644 src/Example/languages/fr.ts create mode 100644 src/Example/languages/ja.ts create mode 100644 src/Example/languages/pl.ts create mode 100644 src/Example/languages/ru.ts create mode 100644 src/Example/languages/tr.ts create mode 100644 src/Example/languages/uk.ts create mode 100644 src/Example/languages/zh.ts diff --git a/CMakeLists.txt b/CMakeLists.txt index bda688b..21e2361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,15 +48,13 @@ endif() if (NOT DEFINED RENAME_ME_EXAMPLE) set(RENAME_ME_EXAMPLE ON) - if (ANDROID) - set(RENAME_ME_EXAMPLE OFF) - endif() - if (NOT QT_VERSION_MAJOR) set(RENAME_ME_EXAMPLE OFF) endif() endif() +initAll() + add_subdirectory(src/Library) if (DEFINED RENAME_ME_EXAMPLE) @@ -69,7 +67,6 @@ else() message("The ${PROJECT_NAME} tests is disabled.") 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/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index a09e4a1..02754fb 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -29,7 +29,7 @@ set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Private") -if (${QT_VERSION_MAJOR}) +if (${QT_VERSION_MAJOR} EQUAL 6) qt_add_executable(${CURRENT_PROJECT} MANUAL_FINALIZATION ${ALL_SOURCES}) target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt${QT_VERSION_MAJOR}::Core) diff --git a/src/Example/languages/de.ts b/src/Example/languages/de.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/de.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/en.ts b/src/Example/languages/en.ts index 17ac17a..6401616 100644 --- a/src/Example/languages/en.ts +++ b/src/Example/languages/en.ts @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> <TS version="2.1"> - </TS> diff --git a/src/Example/languages/es.ts b/src/Example/languages/es.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/es.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/fr.ts b/src/Example/languages/fr.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/fr.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/ja.ts b/src/Example/languages/ja.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/ja.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/pl.ts b/src/Example/languages/pl.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/pl.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/ru.ts b/src/Example/languages/ru.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/ru.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/tr.ts b/src/Example/languages/tr.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/tr.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/uk.ts b/src/Example/languages/uk.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/uk.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/src/Example/languages/zh.ts b/src/Example/languages/zh.ts new file mode 100644 index 0000000..6401616 --- /dev/null +++ b/src/Example/languages/zh.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS>