Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
@@ -95,9 +95,13 @@ endif()
|
||||
# SV: logView
|
||||
NGL_ADD_LIBRARY2(WS AAR SV nglwidgets SHARED ${nglwidgets_SRCS} ${oxygen_SRCS})
|
||||
if(HAVE_POPPLER_QT6)
|
||||
target_compile_definitions(nglwidgets PRIVATE HAVE_POPPLER_QT6)
|
||||
target_include_directories(nglwidgets PRIVATE ${POPPLER_QT6_INCLUDE_DIRS})
|
||||
target_link_libraries(nglwidgets PRIVATE ${POPPLER_QT6_LIBRARIES})
|
||||
# nglpdfwidget.h is a public header that conditionally includes poppler and
|
||||
# declares poppler-typed methods under HAVE_POPPLER_QT6, so consumers that
|
||||
# include it must see the same definition: propagate the define, the poppler
|
||||
# include dir and the lib on the PUBLIC interface (build-only; no behavior change).
|
||||
target_compile_definitions(nglwidgets PUBLIC HAVE_POPPLER_QT6)
|
||||
target_include_directories(nglwidgets PUBLIC ${POPPLER_QT6_INCLUDE_DIRS})
|
||||
target_link_libraries(nglwidgets PUBLIC ${POPPLER_QT6_LIBRARIES})
|
||||
endif()
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(nglwidgets
|
||||
@@ -114,7 +118,10 @@ endif()
|
||||
NGL_INSTALL_TARGET(nglwidgets)
|
||||
|
||||
# Unit test for PDFWidget
|
||||
IF(BUILD_TESTING AND TARGET nglwidgets AND QT6_GUI_AVAILABLE)
|
||||
# Only buildable when Poppler-Qt6 is available: the nglwidgets lib compiles
|
||||
# nglpdfwidget.cpp (defining NGL::PDFWidget) only under HAVE_POPPLER_QT6, so the
|
||||
# test cannot link otherwise.
|
||||
IF(BUILD_TESTING AND TARGET nglwidgets AND QT6_GUI_AVAILABLE AND HAVE_POPPLER_QT6)
|
||||
FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Test)
|
||||
ADD_EXECUTABLE(test_nglpdfwidget test_nglpdfwidget.cpp)
|
||||
TARGET_LINK_LIBRARIES(test_nglpdfwidget PRIVATE nglwidgets Qt6::Test ${Qt6_Widgets})
|
||||
|
||||
Reference in new issue
Block a user