diff --git a/pip b/pip index cc580d9..6b70045 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit cc580d9385d780cfc0ee34734fbbc1d18d73d961 +Subproject commit 6b7004591406c320e130d046abe0a12ab7c49e2c diff --git a/qad/cmake/QADMacros.cmake b/qad/cmake/QADMacros.cmake index 4e425b5..c799ce3 100644 --- a/qad/cmake/QADMacros.cmake +++ b/qad/cmake/QADMacros.cmake @@ -4,17 +4,6 @@ macro(_qt_install _TARGET IS_APP _DIR _HDR_VAR _QM_FILES) endmacro() -macro(_qt_export_header NAME) - qt_get_target(${NAME} _some_target) - qt_get_target(${NAME} _targets) - foreach(_t ${_targets}) - set_target_properties(${_t} PROPERTIES DEFINE_SYMBOL ${NAME}_EXPORTS) - endforeach() - set_target_properties(${_some_target} PROPERTIES DEFINE_SYMBOL ${NAME}_EXPORTS) - generate_export_header(${_some_target} BASE_NAME "${NAME}") -endmacro() - - macro(_qt_plugin NAME _MODULES _LIBS) if (NOT STATIC_LIB) if(DESIGNER_PLUGINS) @@ -66,7 +55,7 @@ macro(_qt_project NAME IS_APP DOMAIN _MODULES _LIBS) if(NOT STATIC_LIB) qt_target_compile_definitions(${PROJ_NAME} PRIVATE ${DOMAIN}_SHARED_DEFINE) endif() - _qt_export_header(${PROJ_NAME}) + qt_generate_export_header(${PROJ_NAME}) list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJ_NAME}_export.h") endif() qt_target_link_libraries(${PROJ_NAME} ${_LIBS}) diff --git a/qad/cmake/QtWraps.cmake b/qad/cmake/QtWraps.cmake index b25b04d..eac40ee 100644 --- a/qad/cmake/QtWraps.cmake +++ b/qad/cmake/QtWraps.cmake @@ -118,6 +118,13 @@ qt_get_targets( ) Write all real Qt target names to + + +qt_generate_export_header( ...) + +Call generate_export_header on Qt multitarget + + ]] @@ -791,3 +798,14 @@ macro(qt_get_targets _NAME _OUT) endif() endforeach() endmacro() + + +macro(qt_generate_export_header _NAME) + qt_get_target(${_NAME} _some_target) + qt_get_target(${_NAME} _targets) + foreach(_t ${_targets}) + set_target_properties(${_t} PROPERTIES DEFINE_SYMBOL ${_NAME}_EXPORTS) + endforeach() + set_target_properties(${_some_target} PROPERTIES DEFINE_SYMBOL ${_NAME}_EXPORTS) + generate_export_header(${_some_target} BASE_NAME "${_NAME}" ${ARGN}) +endmacro() diff --git a/qglengine/CMakeLists.txt b/qglengine/CMakeLists.txt index 471ea04..b7e6f0f 100644 --- a/qglengine/CMakeLists.txt +++ b/qglengine/CMakeLists.txt @@ -32,7 +32,7 @@ else() INFO "QGLEngine core library") make_rc(qglengine_core _RC) qt_add_library(qglengine_core SHARED out_CPP ${_RC}) - _qt_export_header(qglengine_core) + qt_generate_export_header(qglengine_core) list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/qglengine_core_export.h") qt_target_include_directories(qglengine_core PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core") qt_target_link_libraries(qglengine_core qad_utils qad_widgets assimp ${OPENGL_LIBRARIES}) diff --git a/qglengine/widgets/CMakeLists.txt b/qglengine/widgets/CMakeLists.txt index 00613f4..731a819 100644 --- a/qglengine/widgets/CMakeLists.txt +++ b/qglengine/widgets/CMakeLists.txt @@ -16,7 +16,7 @@ set_deploy_property(${PROJECT_NAME} SHARED INFO "QGLEngine widgets library") make_rc(${PROJECT_NAME} _RC) qt_add_library(${PROJECT_NAME} SHARED out_CPP ${_RC}) -_qt_export_header(${PROJECT_NAME}) +qt_generate_export_header(${PROJECT_NAME}) list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h") qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qglengine_core) qt_target_include_directories(${PROJECT_NAME} PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../core")