migrate to QAD v2
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
#[[
|
||||
|
||||
shstk_qt_install(dir is_app target h_files qm_files)
|
||||
shstk_qad_install(dir is_app target h_files qm_files)
|
||||
|
||||
shstk_qt_plugin(name modules libs)
|
||||
shstk_qad_plugin(name modules libs)
|
||||
|
||||
shstk_qt_project(name is_app domain modules libs)
|
||||
shstk_qad_project(name is_app domain modules libs)
|
||||
|
||||
]]
|
||||
|
||||
@@ -13,7 +13,7 @@ set(_ok TRUE)
|
||||
if (NOT BUILDING_qad)
|
||||
include(SHSTKMacros)
|
||||
include(QtWraps)
|
||||
find_qt(Core QUIET)
|
||||
qad_find_qt(Core QUIET)
|
||||
find_package(QAD REQUIRED)
|
||||
set(_ok ${QAD_FOUND})
|
||||
endif()
|
||||
@@ -22,7 +22,7 @@ if (_ok)
|
||||
|
||||
|
||||
macro(shstk_qt_founded _out)
|
||||
find_qt(Core QUIET)
|
||||
qad_find_qt(Core QUIET)
|
||||
set(${_out})
|
||||
foreach(_v ${_QT_VERSIONS_})
|
||||
#message("Qt${_v} -> ${LOCAL_FOUND${_v}}")
|
||||
@@ -33,7 +33,7 @@ macro(shstk_qt_founded _out)
|
||||
endmacro()
|
||||
|
||||
|
||||
macro(shstk_qt_install _dir is_app _target _h_files _qm_files)
|
||||
macro(shstk_qad_install _dir is_app _target _h_files _qm_files)
|
||||
#message("QM=${_qm_files}")
|
||||
if((NOT ${is_app}) AND (NOT "x${_h_files}" STREQUAL "x"))
|
||||
if(LOCAL)
|
||||
@@ -48,38 +48,38 @@ macro(shstk_qt_install _dir is_app _target _h_files _qm_files)
|
||||
endif()
|
||||
if(NOT "x${_qm_files}" STREQUAL "x")
|
||||
if(LOCAL)
|
||||
qt_install(LANG ${_qm_files} DESTINATION lang)
|
||||
qad_install(LANG ${_qm_files} DESTINATION lang)
|
||||
else()
|
||||
qt_install(LANG ${_qm_files} DESTINATION QtLang)
|
||||
qad_install(LANG ${_qm_files} DESTINATION QtLang)
|
||||
endif()
|
||||
endif()
|
||||
if (NOT "x${_target}" STREQUAL "x")
|
||||
if(LOCAL)
|
||||
if(${is_app})
|
||||
qt_install(TARGETS ${_target} DESTINATION bin)
|
||||
qad_install(TARGETS ${_target} DESTINATION bin)
|
||||
else()
|
||||
if(WIN32)
|
||||
qt_install(TARGETS ${_target} RUNTIME DESTINATION bin)
|
||||
qt_install(TARGETS ${_target} ARCHIVE DESTINATION lib)
|
||||
qad_install(TARGETS ${_target} RUNTIME DESTINATION bin)
|
||||
qad_install(TARGETS ${_target} ARCHIVE DESTINATION lib)
|
||||
else()
|
||||
qt_install(TARGETS ${_target} DESTINATION lib)
|
||||
qad_install(TARGETS ${_target} DESTINATION lib)
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
if(WIN32)
|
||||
if (${is_app})
|
||||
qt_install(TARGETS ${_target} DESTINATION ${MINGW_BIN})
|
||||
qt_install(TARGETS ${_target} DESTINATION QtBin)
|
||||
qad_install(TARGETS ${_target} DESTINATION ${MINGW_BIN})
|
||||
qad_install(TARGETS ${_target} DESTINATION QtBin)
|
||||
else()
|
||||
qt_install(TARGETS ${_target} ARCHIVE DESTINATION ${MINGW_LIB})
|
||||
qt_install(TARGETS ${_target} RUNTIME DESTINATION ${MINGW_BIN})
|
||||
qt_install(TARGETS ${_target} RUNTIME DESTINATION QtBin)
|
||||
qad_install(TARGETS ${_target} ARCHIVE DESTINATION ${MINGW_LIB})
|
||||
qad_install(TARGETS ${_target} RUNTIME DESTINATION ${MINGW_BIN})
|
||||
qad_install(TARGETS ${_target} RUNTIME DESTINATION QtBin)
|
||||
endif()
|
||||
else()
|
||||
if (${is_app})
|
||||
qt_install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
||||
qad_install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
||||
else()
|
||||
qt_install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
qad_install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
@@ -87,7 +87,7 @@ macro(shstk_qt_install _dir is_app _target _h_files _qm_files)
|
||||
endmacro()
|
||||
|
||||
|
||||
macro(shstk_qt_plugin NAME _MODULES _LIBS)
|
||||
macro(shstk_qad_plugin NAME _MODULES _LIBS)
|
||||
if (NOT STATIC_LIB)
|
||||
if(DESIGNER_PLUGINS)
|
||||
set(PROJ_NAME ${NAME}_plugin)
|
||||
@@ -96,15 +96,15 @@ macro(shstk_qt_plugin NAME _MODULES _LIBS)
|
||||
add_definitions(-DQT_NO_DEBUG)
|
||||
add_definitions(-DQT_SHARED)
|
||||
add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
|
||||
find_qt(${QtVersions} Core Designer ${_MODULES})
|
||||
qt_sources(SRC)
|
||||
qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
|
||||
qt_add_library(${PROJ_NAME} SHARED out_CPP)
|
||||
qt_target_link_libraries(${PROJ_NAME} ${_LIBS} ${_${NAME}_PLUGIN_LIBS})
|
||||
qad_find_qt(${QtVersions} Core Designer ${_MODULES})
|
||||
qad_sources(SRC)
|
||||
qad_wrap(${SRC} CPPS out_CPP QMS out_QM)
|
||||
qad_add_library(${PROJ_NAME} SHARED out_CPP)
|
||||
qad_target_link_libraries(${PROJ_NAME} ${_LIBS} ${_${NAME}_PLUGIN_LIBS})
|
||||
if (WIN32)
|
||||
qt_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer)
|
||||
qad_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer)
|
||||
else()
|
||||
qt_install(TARGETS ${PROJ_NAME} DESTINATION QtPlugins/designer)
|
||||
qad_install(TARGETS ${PROJ_NAME} DESTINATION QtPlugins/designer)
|
||||
endif()
|
||||
list(APPEND _qt_plugs ${NAME})
|
||||
shstk_copy_to_parent()
|
||||
@@ -113,11 +113,11 @@ macro(shstk_qt_plugin NAME _MODULES _LIBS)
|
||||
endmacro()
|
||||
|
||||
|
||||
macro(shstk_qt_project NAME IS_APP DOMAIN _MODULES _LIBS)
|
||||
macro(shstk_qad_project NAME IS_APP DOMAIN _MODULES _LIBS)
|
||||
project(${NAME})
|
||||
#message("find_qt ${NAME} \"${QtVersions}\" \"${_MODULES}\"")
|
||||
find_qt(${QtVersions} Core ${_MODULES})
|
||||
qt_sources(SRC)
|
||||
#message("qad_find_qt ${NAME} ${IS_APP} \"${QtVersions}\" \"${_MODULES}\"")
|
||||
qad_find_qt(${QtVersions} Core ${_MODULES})
|
||||
qad_sources(SRC)
|
||||
import_version(${PROJECT_NAME} ${DOMAIN})
|
||||
import_deploy_properties(${PROJECT_NAME} ${DOMAIN})
|
||||
if (${IS_APP})
|
||||
@@ -135,26 +135,27 @@ macro(shstk_qt_project NAME IS_APP DOMAIN _MODULES _LIBS)
|
||||
INFO "${DOMAIN} ${NAME} library")
|
||||
endif()
|
||||
make_rc(${PROJECT_NAME} out_RC)
|
||||
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC})
|
||||
qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC})
|
||||
#message("add_exe proj ${NAME}, ${${DOMAIN}_DOMAIN}.${PROJECT_NAME}")
|
||||
if (${IS_APP})
|
||||
qt_add_executable(${PROJECT_NAME} WIN32 out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
|
||||
qad_add_executable(${PROJECT_NAME} WIN32 out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
|
||||
else()
|
||||
set(_libtype SHARED)
|
||||
if (NOT "x${${DOMAIN}_LIB_TYPE}" STREQUAL "x")
|
||||
set(_libtype ${${DOMAIN}_LIB_TYPE})
|
||||
endif()
|
||||
qt_add_library(${PROJECT_NAME} ${_libtype} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
|
||||
qad_add_library(${PROJECT_NAME} ${_libtype} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
|
||||
#if(NOT ${DOMAIN}_STATIC_LIB)
|
||||
# qt_target_compile_definitions(${PROJECT_NAME} PRIVATE ${DOMAIN}_SHARED_DEFINE)
|
||||
# qad_target_compile_definitions(${PROJECT_NAME} PRIVATE ${DOMAIN}_SHARED_DEFINE)
|
||||
#endif()
|
||||
qt_generate_export_header(${PROJECT_NAME})
|
||||
qad_generate_export_header(${PROJECT_NAME})
|
||||
list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h")
|
||||
|
||||
list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
|
||||
#message("${QT_MULTILIB_LIST}")
|
||||
#set(QT_MULTILIB_LIST "${QT_MULTILIB_LIST}" CACHE STRING "")
|
||||
endif()
|
||||
qt_target_link_libraries(${PROJECT_NAME} ${_LIBS})
|
||||
qad_target_link_libraries(${PROJECT_NAME} ${_LIBS})
|
||||
file(GLOB_RECURSE PHS "*_p.h")
|
||||
if ((NOT "x${out_HDR}" STREQUAL "x") AND (NOT "x${PHS}" STREQUAL "x"))
|
||||
list(REMOVE_ITEM out_HDR ${PHS})
|
||||
|
||||
Reference in New Issue
Block a user