Commit 0b3b1355 authored by David Faure's avatar David Faure
Browse files

Enable compilation of kwebenginepart, rename some subdirs for consistency

parent 90385bdf
......@@ -19,7 +19,7 @@ include(ECMSetupVersion)
set(KONQUEROR_LIB_VERSION "5.0.97")
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash)
find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities) # Optional
......@@ -42,6 +42,7 @@ add_subdirectory( libkonq )
add_subdirectory( src )
add_subdirectory( client )
add_subdirectory( autotests )
add_subdirectory( kwebenginepart )
add_subdirectory( about )
add_subdirectory( pics )
......
cmake_minimum_required(VERSION 2.8.12)
project(webenginepart)
# search packages used by KDE
find_package(ECM REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Gui Widgets WebEngineWidgets PrintSupport)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets DBusAddons KIO Parts Activities I18n)
find_package(KF5Parts)
find_package(KF5Sonnet)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_subdirectory(icons)
add_subdirectory(src)
add_subdirectory(kdelauncher)
add_subdirectory(tests)
project(kdelauncher)
# search packages used by KDE
find_package(ECM REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Gui Widgets WebEngineWidgets UiTools)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets DBusAddons KIO KDELibs4Support Parts Activities I18n)
find_package(KF5Parts)
find_package(KF5Sonnet)
include(MacroLibrary)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_executable(kdelauncher main.cpp )
target_link_libraries(kdelauncher webenginepart Qt5::Core Qt5::Gui Qt5::Widgets Qt5::WebEngineWidgets KF5::I18n KF5::KDELibs4Support)
set_target_properties(kdelauncher PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_executable(webenginepart_tester webenginepart_tester.cpp)
target_link_libraries(webenginepart_tester webenginepart Qt5::Core Qt5::Gui Qt5::Widgets Qt5::WebEngineWidgets KF5::I18n KF5::KDELibs4Support)
......@@ -434,4 +434,4 @@ int main(int argc, char **argv)
}
}
#include "main.moc"
#include "webenginepart_tester.moc"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment