--- ui/zenoui/CMakeLists.txt.orig 2024-09-30 13:46:54 UTC +++ ui/zenoui/CMakeLists.txt @@ -1,8 +1,8 @@ -find_package(Qt5 REQUIRED COMPONENTS Widgets Svg OpenGL Network) +find_package(Qt6 REQUIRED COMPONENTS Widgets Svg SvgWidgets OpenGL OpenGLWidgets Network) file(GLOB_RECURSE source CONFIGURE_DEPENDS *.h *.cpp *.ui) file(GLOB_RECURSE resource CONFIGURE_DEPENDS *.qrc) -qt5_add_big_resources(source ${resource}) # cihou msvc: fatal error C1060: compiler is out of heap space +qt6_add_big_resources(source ${resource}) # cihou msvc: fatal error C1060: compiler is out of heap space add_library(zenoui OBJECT ${source}) @@ -14,11 +14,11 @@ if (ZENO_DEBUG_MSVC) zeno_dbg_msvc(zenoui) endif() -target_link_libraries(zenoui PUBLIC Qt5::Widgets Qt5::Svg Qt5::Network) +target_link_libraries(zenoui PUBLIC Qt6::Widgets Qt6::Svg Qt6::SvgWidgets Qt6::Network) target_link_libraries(zenoui PUBLIC zeno) -target_include_directories(zenoui PRIVATE ${Qt5Widgets_PRIVATE_INCLUDE_DIRS}) -target_include_directories(zenoui PRIVATE . .. ../include ../qwt/include) +# hotfix for freebsd: use the system Qwt built for Qt 6 +target_include_directories(zenoui PRIVATE . .. ../include ${QWT_INCLUDE_DIR}) if (WIN32) if (CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -27,5 +27,7 @@ if (WIN32) target_link_libraries(zenoui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../qwt/libs/win/qwt.lib) endif() else() - target_link_libraries(zenoui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../qwt/libs/linux/libqwt.a) + # hotfix for freebsd + target_link_libraries(zenoui PRIVATE ${QWT_LIBRARY}) endif() +