up

Author: benapetr

src/tests/test/CMakeLists.txt

@@ -24,15 +24,9 @@ if (QT6_BUILD)
         ${Qt6Test_INCLUDE_DIRS}
         ${Qt6Svg_INCLUDE_DIRS}
     )
-    if (NOT WEB_ENGINE)
-        find_package(Qt6WebKitWidgets REQUIRED)
-        find_package(Qt6WebKit REQUIRED)
-        set(QT_INCLUDES ${QT_INCLUDES} ${Qt6WebKit_INCLUDE_DIRS})
-    else()
-        find_package(Qt6WebEngine REQUIRED)
-        find_package(Qt6WebEngineWidgets REQUIRED)
-        set(QT_INCLUDES ${QT_INCLUDES} ${Qt6WebEngine_INCLUDE_DIRS})
-    endif()
+    find_package(Qt6WebEngineCore REQUIRED)
+    find_package(Qt6WebEngineWidgets REQUIRED)
+    set(QT_INCLUDES ${QT_INCLUDES} ${Qt6WebEngineCore_INCLUDE_DIRS})
 elseif (QT5_BUILD)
     find_package(Qt5Core REQUIRED)
     find_package(Qt5Gui REQUIRED)
@@ -91,11 +85,7 @@ TARGET_LINK_LIBRARIES(tst_testmain ${QT_LIBRARIES})
 TARGET_LINK_LIBRARIES(tst_testmain huggle_core irc ircclient yaml-cpp)
 
 if (QT6_BUILD)
-    if (NOT WEB_ENGINE)
-        TARGET_LINK_LIBRARIES(tst_testmain Qt6::Core Qt6::Test Qt6::Gui Qt6::Widgets Qt6::WebKitWidgets Qt6::WebKit Qt6::Network Qt6::Xml)
-    else()
-        TARGET_LINK_LIBRARIES(tst_testmain Qt6::Core Qt6::Test Qt6::Gui Qt6::Widgets Qt6::WebEngineWidgets Qt6::WebEngine Qt6::Network Qt6::Xml)
-    endif()
+    TARGET_LINK_LIBRARIES(tst_testmain Qt6::Core Qt6::Test Qt6::Gui Qt6::Widgets Qt6::WebEngineWidgets Qt6::WebEngineCore Qt6::Network Qt6::Xml)
 elseif (QT5_BUILD)
     if (NOT WEB_ENGINE)
         TARGET_LINK_LIBRARIES(tst_testmain Qt5::Core Qt5::Test Qt5::Gui Qt5::Widgets Qt5::WebKitWidgets Qt5::WebKit Qt5::Network Qt5::Xml)

windows64/veyor.ps1

@@ -167,7 +167,7 @@ if (!(Test-Path("definitions.hpp")))
 }
 
 # patch yaml-cpp
-cd $root_path\src\3rd\yaml-cpp
+cd $root_path\..\src\3rd\yaml-cpp
 git checkout ee99c4151c1af794a412b101a75921c086acaac0
 
 #let's try to invoke cmake now