SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@731 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2020-03-05 08:27:52 +00:00
parent c38b5faf57
commit 3dca147284
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SDKMacros.cmake
View File

@@ -15,6 +15,7 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES)
qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()
if(NOT "x${_QM_FILES}" STREQUAL "x") if(NOT "x${_QM_FILES}" STREQUAL "x")
message("QM=${_QM_FILES})
qt_install(FILES ${_QM_FILES} DESTINATION QtLang) qt_install(FILES ${_QM_FILES} DESTINATION QtLang)
endif() endif()
else() else()

2
qad/CMakeLists.txt
View File

@@ -131,12 +131,10 @@ macro(qad_project NAME _MODULES _LIBS)
set(${NAME}_UTILS ${UTILS}) set(${NAME}_UTILS ${UTILS})
endif() endif()
message(STATUS "Building ${PROJ_NAME}") message(STATUS "Building ${PROJ_NAME}")
if (NOT DEFINED ANDROID_PLATFORM)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
set(_${NAME}_PLUGIN_LIBS "${_LIBS}") set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
add_subdirectory(plugin) add_subdirectory(plugin)
endif() endif()
endif()
endmacro() endmacro()
set(DIRS utils widgets application blockview graphic sql_table touch_widgets) set(DIRS utils widgets application blockview graphic sql_table touch_widgets)