From 2c3b026349349729141ca46bd9d292327da2dfe2 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 13 Nov 2025 13:48:37 +0100 Subject: Port to QtWebEngine (thx Junie), bump to C++20 --- CMakeLists.txt | 52 +++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f188f66..b71df00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,58 +1,44 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.11) # project name project(slxbrowser) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_BUILD_TYPE Debug) -set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -Wextra -Werror -Wno-multichar -std=c++11") -set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wno-multichar -std=c++11") +set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -Wextra -Werror -Wno-multichar -std=c++20") +set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wno-multichar -std=c++20") set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -file(GLOB_RECURSE SLXBROWSER_SOURCES src/*.cpp) -#file(GLOB_RECURSE SLXBROWSER_MOC_HEADERS src/*.h) -#file(GLOB_RECURSE SLXBROWSER_UIS src/ui/*.ui) -#file(GLOB_RECURSE SLXBROWSER_RESOURCES src/*.qrc) +set(SLXBROWSER_HEADERS + src/nam.h + src/slxbrowser.h + src/webview.h +) -#include_directories(${CMAKE_CURRENT_BINARY_DIR} ./) +set(SLXBROWSER_SOURCES + src/main.cpp + src/nam.cpp + src/slxbrowser.cpp + src/webview.cpp +) # -# Qt4 +# Qt5 # -find_package(Qt5WebKitWidgets) - -#if(Qt5_FOUND) -# message(STATUS "Qt5 found") -#else(Qt5_FOUND) -# message(FATAL_ERROR "Qt5 not found") -#endif(Qt5_FOUND) - -#set(QT_USE_QTXML TRUE) -#set(QT_USE_QTSVG TRUE) -#set(QT_USE_QTNETWORK TRUE) -#set(QT_USE_QTWEBKIT TRUE) - -#include(${QT_USE_FILE}) - -#QT4_ADD_RESOURCES(SLXBROWSER_RC_SOURCES ${SLXBROWSER_RESOURCES}) -#QT5_WRAP_UI(SLXBROWSER_UI_HEADERS ${SLXBROWSER_UIS}) -#QT5_WRAP_CPP(SLXBROWSER_MOC_SOURCES ${SLXBROWSER_MOC_HEADERS}) +find_package(Qt5 COMPONENTS WebEngineWidgets REQUIRED) # # build slxbrowser # add_executable(slxbrowser + ${SLXBROWSER_HEADERS} ${SLXBROWSER_SOURCES} -# ${SLXBROWSER_MOC_SOURCES} -# ${SLXBROWSER_UI_HEADERS} -# ${SLXBROWSER_RC_SOURCES} -# ${SLXBROWSER_QMS} ) target_link_libraries(slxbrowser - Qt5::WebKitWidgets + Qt5::WebEngineWidgets ) install(TARGETS slxbrowser RUNTIME DESTINATION bin) -- cgit v1.2.3-55-g7522