diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..2c43366 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.16) +project(Browser) + + +set_property(GLOBAL PROPERTY CMAKE_CXX_STANDARD 17) +set_property(GLOBAL PROPERTY CMAKE_CXX_STANDARD_REQUIRED ON) + +add_subdirectory(qtermwidget) +add_subdirectory(digitalclock) +add_subdirectory(src) diff --git a/browser.pro b/browser.pro deleted file mode 100644 index 01978c7..0000000 --- a/browser.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = qtermwidget digitalclock src - -OPTIONS += ordered -CONFIG += qt warn_on release diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..70071f3 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,37 @@ +cmake_minimum_required(VERSION 3.16) + +project(OGBrowser LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + + +find_package(QT NAMES Qt5 COMPONENTS Widgets LinguistTools Network WebEngineWidgets REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets LinguistTools Network WebEngineWidgets REQUIRED) + + +message(STATUS "Building browser with Qt ${QT_VERSION}") + +set(SOURCES + main.cpp + mainwindow.cpp + ) + + +add_executable(OGBrowser ${SOURCES} ) + +set_property(TARGET OGBrowser PROPERTY CXX_STANDARD 17) +set_property(TARGET OGBrowser PROPERTY CXX_STANDARD_REQUIRED ON) + +target_include_directories(OGBrowser PRIVATE "digitalclock" "qtermwidget/lib") +target_link_libraries(OGBrowser PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::WebEngineWidgets DigitalClock qtermwidget5) + +message(STATUS "Looking for headers in ${PROJECT_BINARY_DIR}") +target_include_directories(OGBrowser PRIVATE ${qtermwidget_INCLUDE_DIRS} ${DigitalClock_INCLUDE_DIRS} ${qtermwidget_LIB_DIRS}/lib ${PROJECT_BINARY_DIR}/../lib) +target_link_directories(OGBrowser PRIVATE ${qtermwidget_LIB_DIRS} ${DigitalClock_LIB_DIRS}) + + + diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index ed5cc82..0000000 --- a/src/src.pro +++ /dev/null @@ -1,28 +0,0 @@ -TEMPLATE = app -DESTDIR = .. - -CONFIG += qt release warn_on build_all - -QT += core gui webkit - -MOC_DIR = ../.moc - -# CONFIG(debug, debug|release) { -# OBJECTS_DIR = ../.objs_d -# TARGET = browser_d -# LIBS += -L.. #../libqtermwidget_d.a -#} else { -# OBJECTS_DIR = ../.objs -# TARGET = browser -# LIBS += -L.. #../libqtermwidget.a -#} - -OBJECTS_DIR = ../.objs -TARGET = browser -LIBS += -L.. -lqtermwidget -ldigitalclock - -SOURCES = main.cpp mainwindow.cpp - -HEADERS = mainwindow.h - -INCLUDEPATH = ../qtermwidget/src ../digitalclock