From ab1f3837e62042afa8ee23301fbf5f5b2a873c1f Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Mon, 5 Apr 2021 00:07:50 +0300
Subject: [PATCH] backport fixes from the cmake template

---
 CMakeLists.txt                            | 26 +++++++++++++++++++++--
 src/Example/CMakeLists.txt                |  6 +++++-
 src/Library/CopyrighFixer/CopyrighFixer.h |  4 ++--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40f140c..db31e45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,11 +23,33 @@ include(CMake/QuasarAppCITargets.cmake)
 
 # Add sub directories
 add_subdirectory(src)
-if (${QT_VERSION_MAJOR})
-    add_subdirectory(tests)
+
+
+if (NOT DEFINED COPYRIGHT_FIXER_TESTS)
+    set(COPYRIGHT_FIXER_TESTS ON)
+
+    if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
+        if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32")
+            set(COPYRIGHT_FIXER_TESTS OFF)
+        endif()
+    endif()
+
+    if (ANDROID)
+        set(COPYRIGHT_FIXER_TESTS OFF)
+    endif()
+
+    if (NOT QT_VERSION_MAJOR)
+        set(COPYRIGHT_FIXER_TESTS OFF)
+    endif()
 endif()
 
 
+if (COPYRIGHT_FIXER_TESTS)
+    add_subdirectory(tests)
+else()
+    message("The ${PROJECT_NAME} tests is disabled.")
+endif()
+
 initAll()
 
 addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt
index cb9f12c..51aa74e 100644
--- a/src/Example/CMakeLists.txt
+++ b/src/Example/CMakeLists.txt
@@ -21,7 +21,11 @@ file(GLOB SOURCE_CPP
 set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Private")
 
-add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
+if (ANDROID)
+    add_library(${CURRENT_PROJECT} ${SOURCE_CPP})
+else ()
+    add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
+endif()
 
 if (${QT_VERSION_MAJOR})
     target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt${QT_VERSION_MAJOR}::Core)
diff --git a/src/Library/CopyrighFixer/CopyrighFixer.h b/src/Library/CopyrighFixer/CopyrighFixer.h
index 5173073..1511d5c 100644
--- a/src/Library/CopyrighFixer/CopyrighFixer.h
+++ b/src/Library/CopyrighFixer/CopyrighFixer.h
@@ -7,10 +7,10 @@
 
 #include "CopyrighFixer_global.h"
 
-namespace CopyrighFixer {
-
 inline void initCopyrighFixerResources() { Q_INIT_RESOURCE(CopyrighFixer); }
 
+namespace CopyrighFixer {
+
 
 bool CopyrighFixer_EXPORT init();