afsim-2.9.0升级Qt5.15.2
环境
- Windows 11
- CMake 4.0.0
- Visual Studio 2022
- Qt5.15.2
源码目录结构
|- afsim-2.9.0-win64
|- |- demos
|- |- documentation
|- |- resources
|- |- swdev
|- |- |- build-qt
|- |- |- dependencies
|- |- |- src
|- |- |- |- CMakeLists.txt
…
参考文章
AFSIM入门教程03.01:Windows下编译
AFSIM入门教程索引
一、afsim-2.9.0升级Qt5.15.2
全部替换qt-5.12.11 为 qt-5.15.2
从tools\3rd_party-cmake\qt-5.12.11.cmake 复制tools\3rd_party-cmake\qt-5.15.2.cmake
修改tools\3rd_party-cmake\qt-5.15.2.cmake
swdev\src\CMakeLists.txt 添加
# 设置Qt根目录 - 这将覆盖swdev_acquire_packages自动设置的值 set(qt_ROOT_DIR "D:/Qt/5.15.2/msvc2019_64" CACHE PATH "Path to Qt installation" FORCE) message(STATUS "Qt根目录已设置为: ${qt_ROOT_DIR}")或者直接在CMAKEGUI中添加
- swdev\src\tools\3rd_party-cmake\config.cmake
if (usingPackage) set(${pkgBaseName}_ROOT_DIR "${SWDEV_THIRD_PARTY_ROOT}/${pkgname}") include("${CURRENT_LIST_DIR}/${pkg}.cmake") if ("${EXE_TARGET_DIRECTORY}" STREQUAL "") set_property(GLOBAL APPEND PROPERTY SWDEV_ALL_PACKAGES_USED ${pkgBaseName}) else() set_property(DIRECTORY ${EXE_TARGET_DIRECTORY} APPEND PROPERTY SWDEV_ALL_PACKAGES_USED ${pkgBaseName}) endif() endif()修改为
if (usingPackage) # 只有在${pkgBaseName}_ROOT_DIR未设置时才设置它,这样可以允许用户在外部覆盖 if(NOT DEFINED ${pkgBaseName}_ROOT_DIR) set(${pkgBaseName}_ROOT_DIR "${SWDEV_THIRD_PARTY_ROOT}/${pkgname}") message(STATUS "自动设置${pkgBaseName}_ROOT_DIR为: ${${pkgBaseName}_ROOT_DIR}") else() message(STATUS "使用用户指定的${pkgBaseName}_ROOT_DIR: ${${pkgBaseName}_ROOT_DIR}") endif() include("${CURRENT_LIST_DIR}/${pkg}.cmake") if ("${EXE_TARGET_DIRECTORY}" STREQUAL "") set_property(GLOBAL APPEND PROPERTY SWDEV_ALL_PACKAGES_USED ${pkgBaseName}) else() set_property(DIRECTORY ${EXE_TARGET_DIRECTORY} APPEND PROPERTY SWDEV_ALL_PACKAGES_USED ${pkgBaseName}) endif() else() message(STATUS "文件: ${CMAKE_CURRENT_LIST_FILE} 行: ${CMAKE_CURRENT_LIST_LINE} ${pkgBaseName}_ROOT_DIR:usingPackage= ${usingPackage}") # 只有在${pkgBaseName}_ROOT_DIR未设置时才设置它,这样可以允许用户在外部覆盖 if(NOT DEFINED ${pkgBaseName}_ROOT_DIR) message(WARNING "文件: ${CMAKE_CURRENT_LIST_FILE} 行: ${CMAKE_CURRENT_LIST_LINE} ${pkgBaseName}_ROOT_DIR没有找到${${pkgBaseName}_ROOT_DIR}") else() message(STATUS "使用用户指定的${pkgBaseName}_ROOT_DIR: ${${pkgBaseName}_ROOT_DIR}") include("${CURRENT_LIST_DIR}/${pkg}.cmake") endif() endif()CMAKE中确保QT路径
如果使用Release则不用添加BUILD_TYPE、CMAKE_BUILD_TYPE ,使用RelWithDebInfo如下
CMAKE_BUILD_TYPE
swdev\src\wsf_plugins\wsf_oms_uci\source\CMakeLists.txt
添加
$<$<CONFIG:RelWithDebInfo>:${REL_DLLS}>
# 2. 修改add_custom_command:复制对应配置的DLL到目标目录 add_custom_command(TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy $<$<CONFIG:Debug>:${DBG_DLLS}> $<$<CONFIG:Release>:${REL_DLLS}> $<$<CONFIG:RelWithDebInfo>:${REL_DLLS}> $<TARGET_FILE_DIR:${PROJECT_NAME}>)swdev\src\tools\utilqt\source\UtQtPieChart.cpp
包含头文件
#include <QPainterPath>swdev\src\tools\wkf\core\source\WkfViewer.cpp
包含头文件#include <QKeyEvent>
swdev\src\tools\wkf\common\source\selectors\WkfImageSelectorWidget.cpp包含头文件
#include <QDragEnterEvent>#include <QDropEvent>swdev\src\core\wsf\source\WsfThreadPool.hpp包含头文件
#include <chrono>swdev\src\tools\wkf\plugins\TerrainTools\source\LOS_Ruler.cpp包含头文件
#include <QPainterPath>swdev\src\mystic\plugins\ResultInteractionPlots\source\WaterfallPlot.cpp包含头文件
#include <QWheelEvent>swdev\src\warlock\warlock_core\source\WkScriptTypes.hpp包含头文件
#include <QString>#include <QDataStream>swdev\src\wizard\lib\source\core\Environment.hpp包含头文件
#include <QFocusEvent>swdev\src\warlock\plugins\TrackDetailsDisplay\source\TrackDetailsDisplayDialog.cpp包含头文件
#include <QKeyEvent>swdev\src\mover_creator\source\ConvertBrawlerAircraftDialog.cpp
// TODO:ERROR//geometryObject[0] = vehicleMassObject;geometryObject=vehicleMassObject;swdev\src\warlock\plugins\DialogBuilder\source\DialogBuilderMainDialog.cpp包含头文件
#include <QDragEnterEvent>#include <QDropEvent>swdev\src\wizard\plugins\PatternVisualization\source\PatternPolarPlotLayer.cpp包含头文件
#include <QPainterPath>swdev\src\core\sensor_plot_lib\source\HorizontalMapFunction.cpp加上
std::swdev\src\mystic\plugins\ResultTimeController\source\RvTimeControllerToolbarWidgets.cpp包含头文件
#include <QMouseEvent>swdev\src\wizard\plugins\PatternVisualization\source\PatternPolarPlotLayer.hpp包含头文件
#include <QPainterPath>swdev\src\warlock\plugins\SixDOF_Tuner\source\TunerMainWidget.cpp
和swdev\src\mover_creator\source\ScriptGeneratorRigidBodySixDOF.cpp
和swdev\src\mover_creator\source\AeroLiquidRocketEngine.cpp
和swdev\src\mover_creator\source\AeroJetEngine.cpp
和swdev\src\mover_creator\source\AeroRamjetEngine.cpp
和swdev\src\mover_creator\source\ScriptGeneratorPointMassSixDOF.cpp
和swdev\src\mover_creator\source\AeroSolidRocketEngine.cpp
和swdev\src\mover_creator\source\BrawlerConverter.cpp
和swdev\src\mover_creator\source\VehicleLandingGear.cpp
和swdev\src\mover_creator\source\ScriptGeneratorSixDOF.cpp
替换
swdev\src\mover_creator\source\SolidRocketEngineWidget.cpp
#ifQT_DEPRECATED_SINCE(5,15)connect(mUIPtr->specificationsComboBox,&QComboBox::textActivated,this,&SolidRocketEngineWidget::HandleSpecificationsComboBoxChanged);connect(mUIPtr->massComboBox,&QComboBox::textActivated,this,&SolidRocketEngineWidget::HandleMassComboBoxChanged);connect(mUIPtr->altitudeComboBox,&QComboBox::textActivated,this,&SolidRocketEngineWidget::HandleAltitudeComboBoxChanged);connect(mUIPtr->propellantMassComboBox,&QComboBox::textActivated,this,&SolidRocketEngineWidget::HandlePropellantMassComboBoxChanged);#elseconnect(mUIPtr->specificationsComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::activated),this,&SolidRocketEngineWidget::HandleSpecificationsComboBoxChanged);connect(mUIPtr->massComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::activated),this,&SolidRocketEngineWidget::HandleMassComboBoxChanged);connect(mUIPtr->altitudeComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::activated),this,&SolidRocketEngineWidget::HandleAltitudeComboBoxChanged);connect(mUIPtr->propellantMassComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::activated),this,&SolidRocketEngineWidget::HandlePropellantMassComboBoxChanged);#endifswdev\src\mover_creator\source\ControlsWidget.cpp
#ifQT_DEPRECATED_SINCE(5,15)connect(mUIPtr->mActivePilotComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ControlSystemTypeChanged(mUIPtr->mActivePilotComboBox->itemText(index));});connect(mUIPtr->mControlSystemTypeComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ControlSystemTypeChanged(mUIPtr->mControlSystemTypeComboBox->itemText(index));});connect(mUIPtr->mYawControlComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});connect(mUIPtr->mWeaponYawControlComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});connect(mUIPtr->mWeaponRollControlComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});connect(mUIPtr->mRollControlSurfacesComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});connect(mUIPtr->mWeaponRollControlSurfacesComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});#elseconnect(mUIPtr->mActivePilotComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mControlSystemTypeComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ControlSystemTypeChanged);connect(mUIPtr->mYawControlComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mWeaponYawControlComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mWeaponRollControlComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mRollControlSurfacesComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mWeaponRollControlSurfacesComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);#endif....#ifQT_DEPRECATED_SINCE(5,15)connect(mUIPtr->mControlSystemTypeComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});connect(mUIPtr->mYawControlMappingComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});connect(mUIPtr->mPitchControlMappingComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});connect(mUIPtr->mRollControlMappingComboBox,QOverload<int>::of(&QComboBox::currentIndexChanged),[=](intindex){this->ValueChanged();});#elseconnect(mUIPtr->mControlSystemTypeComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mYawControlMappingComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mPitchControlMappingComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);connect(mUIPtr->mRollControlMappingComboBox,static_cast<void(QComboBox::*)(constQString&)>(&QComboBox::currentIndexChanged),this,&ControlsWidget::ValueChanged);#endifswdev\src\mover_creator\source\PerformanceWidget.cpp
#ifQT_DEPRECATED_SINCE(5,15)curItem->setSelected(true);#elsemUIPtr->performanceTestTreeWidget->setItemSelected(curItem,true);#endif....#ifQT_DEPRECATED_SINCE(5,15)curItem->setSelected(false);#elsemUIPtr->performanceTestTreeWidget->setItemSelected(curItem,false);#endifswdev\src\wizard\plugins\OSMConverter\source\OSMConverterDataContainer.hpp
#if!QT_DEPRECATED_SINCE(5,15)namespacestd{template<>structhash<QString>{std::size_toperator()(constQString&aString)const{returnqHash(aString);}};}// namespace std#endifswdev\src\wizard\lib\source\map\Platform.cpp
#if!QT_DEPRECATED_SINCE(5,15)namespacestd{template<>structhash<QString>{std::size_toperator()(constQString&s)const{returnqHash(s);}};}// namespace std#endifswdev\src\tools\wkf\core\source\WkfEnvironment.hpp
/** * @brief 获取演示目录路径 * @return QString 演示目录路径 * @note 演示目录位于源代码根目录的上级目录的"demos"文件夹 */#if0QStringGetDemosDir()const{returnQString::fromStdString(mSourceRoot)+"/../demos";}#else//QString GetDemosDir() const { return (mSourceRoot.empty() ? mResourcesDir : QString::fromStdString(mSourceRoot) )+ "/../demos"; }QStringGetDemosDir()const{returnmResourcesDir+"/../demos";}#endif
二、编译
- CMakeTargets/ALL_BUILD
- CMakeTargets/INSTALL
三、使用
swdev\build-qt\wsf_install\bin 拷贝所以到运行目录swdev\build-qt\RelWithDebInfo 或者 swdev\build-qt\Release
拷贝资源文件demos、documentation、resources 运行目录的上层swdev\build-qt\
设置applications/wizard 设置为启动项目
二、编译
- CMakeTargets/ALL_BUILD
- CMakeTargets/INSTALL
三、使用
swdev\build-qt\wsf_install\bin 拷贝所以到运行目录swdev\build-qt\RelWithDebInfo 或者 swdev\build-qt\Release
拷贝资源文件demos、documentation、resources 运行目录的上层swdev\build-qt\
设置applications/wizard 设置为启动项目
