From 3dca1472848e205a406b98232a5b89ddadb7be34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Thu, 5 Mar 2020 08:27:52 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@731
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 SDKMacros.cmake    | 1 +
 qad/CMakeLists.txt | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/SDKMacros.cmake b/SDKMacros.cmake
index affe836..9ceb45b 100644
--- a/SDKMacros.cmake
+++ b/SDKMacros.cmake
@@ -15,6 +15,7 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES)
 			qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
 		if(NOT "x${_QM_FILES}" STREQUAL "x")
+		message("QM=${_QM_FILES})
 			qt_install(FILES ${_QM_FILES} DESTINATION QtLang)
 		endif()
 	else()
diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index 361a121..460ece3 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -131,11 +131,9 @@ macro(qad_project NAME _MODULES _LIBS)
 		set(${NAME}_UTILS ${UTILS})
 	endif()
 	message(STATUS "Building ${PROJ_NAME}")
-	if (NOT DEFINED ANDROID_PLATFORM)
-		if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
-			set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
-			add_subdirectory(plugin)
-		endif()
+	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
+		set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
+		add_subdirectory(plugin)
 	endif()
 endmacro()