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()