diff --git a/qtviewer_planetosm/CMakeLists.txt b/qtviewer_planetosm/CMakeLists.txt index 73df844800b5f9bcfba80788c7696c72740611e5..74ddc492010e9e5600781bd0421b4c8871a10b61 100644 --- a/qtviewer_planetosm/CMakeLists.txt +++ b/qtviewer_planetosm/CMakeLists.txt @@ -126,7 +126,7 @@ target_link_libraries(qplanetosm_widget PRIVATE #==========================ActiveX========================== if (WIN32 AND ${QTV_ACTIVEX}) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) - qt6_add_axserver_library(axplanetosm SHARED + qt6_add_axserver_library(axplanetosm SHARED NO_AX_SERVER_REGISTRATION qtaxviewer_planetosm.def qtaxviewer_planetosm.h qtaxviewer_planetosm.cpp @@ -135,16 +135,32 @@ if (WIN32 AND ${QTV_ACTIVEX}) ${PRJ_FORMS} ${PRJ_RESOURCES} ) -else() - add_library(axplanetosm SHARED - qtaxviewer_planetosm.def - qtaxviewer_planetosm.h - qtaxviewer_planetosm.cpp - ${PRJ_HEADERS} - ${PRJ_SOURCES} - ${PRJ_FORMS} - ${PRJ_RESOURCES} - ) + add_custom_command(TARGET axplanetosm + POST_BUILD + COMMAND echo If you want to reg server, please set Qt BIN PATH first + COMMAND idc.exe \"$\" /regserverperuser + #COMMAND regsvr32 \"$\" + #COMMAND idc.exe \"$\" /regserver + ) + else() + add_library(axplanetosm SHARED + qtaxviewer_planetosm.def + qtaxviewer_planetosm.h + qtaxviewer_planetosm.cpp + ${PRJ_HEADERS} + ${PRJ_SOURCES} + ${PRJ_FORMS} + ${PRJ_RESOURCES} + # C:\Qt\6.2.4\msvc2019_64\bin\idc.exe D:/projects/build-qtv.planet-Qt62vc-Release/bin/axplanetosm.dll /regserver"" + ) + add_custom_command(TARGET axplanetosm + POST_BUILD + COMMAND idc.exe \"$\" /idl \"$.idl\" -version 1.0 + COMMAND midl.exe \"$.idl\" /nologo /tlb \"$.tlb\" + COMMAND idc.exe \"$\" /tlb \"$.tlb\" + COMMAND idc.exe \"$\" /regserverperuser + #COMMAND idc.exe \"$\" /regserver + ) endif() target_link_libraries(axplanetosm PRIVATE Qt${QT_VERSION_MAJOR}::Widgets