libplasmaview -> libplsmaquick
this library will contain all the reusable qtquick and qml related bits necessary for plasma
This commit is contained in:
parent
97ada33110
commit
247c01170a
@ -4,5 +4,5 @@ add_subdirectory(declarativeimports)
|
||||
add_subdirectory(plasmapkg)
|
||||
add_subdirectory(platformstatus)
|
||||
add_subdirectory(scriptengines)
|
||||
add_subdirectory(plasmaview)
|
||||
add_subdirectory(plasmaquick)
|
||||
add_subdirectory(shell)
|
||||
|
@ -1,6 +1,6 @@
|
||||
project(PlasmaView)
|
||||
project(PlasmaQuick)
|
||||
|
||||
set(plasmaview_LIB_SRC
|
||||
set(plasmaquick_LIB_SRC
|
||||
view.cpp
|
||||
configview.cpp
|
||||
containmentconfigview_p.cpp
|
||||
@ -12,9 +12,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
add_library(PlasmaView SHARED ${plasmaview_LIB_SRC})
|
||||
add_library(plasmaquick SHARED ${plasmaquick_LIB_SRC})
|
||||
|
||||
target_link_libraries(PlasmaView
|
||||
target_link_libraries(plasmaquick
|
||||
${Qt5Quick_LIBRARIES}
|
||||
${Qt5Qml_LIBRARIES}
|
||||
${KWindowSystem_LIBRARIES}
|
||||
@ -26,41 +26,41 @@ target_link_libraries(PlasmaView
|
||||
kdeclarative
|
||||
)
|
||||
|
||||
set_target_properties(PlasmaView PROPERTIES
|
||||
set_target_properties(plasmaquick PROPERTIES
|
||||
VERSION 5.0.0
|
||||
SOVERSION 5
|
||||
)
|
||||
|
||||
install(TARGETS PlasmaView EXPORT PlasmaViewTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(TARGETS plasmaquick EXPORT PlasmaQuickTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
generate_export_header(PlasmaView)
|
||||
generate_export_header(plasmaquick)
|
||||
|
||||
set(plasmaview_LIB_INCLUDES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/plasmaview_export.h
|
||||
set(plasmaquick_LIB_INCLUDES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/plasmaquick_export.h
|
||||
view.h
|
||||
configview.h
|
||||
)
|
||||
|
||||
install(FILES ${plasmaview_LIB_INCLUDES}
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaview COMPONENT Devel)
|
||||
install(FILES ${plasmaquick_LIB_INCLUDES}
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaquick COMPONENT Devel)
|
||||
|
||||
install(DIRECTORY
|
||||
includes/PlasmaView
|
||||
includes/PlasmaQuick
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ COMPONENT Devel)
|
||||
|
||||
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/PlasmaView")
|
||||
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/PlasmaQuick")
|
||||
|
||||
configure_package_config_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/PlasmaViewConfig.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/PlasmaViewConfig.cmake"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/PlasmaQuickConfig.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/PlasmaQuickConfig.cmake"
|
||||
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
||||
PATH_VARS INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
|
||||
)
|
||||
|
||||
install(FILES
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/PlasmaViewConfig.cmake"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/PlasmaQuickConfig.cmake"
|
||||
DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel
|
||||
)
|
||||
|
||||
install(EXPORT PlasmaViewTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE PlasmaViewTargets.cmake NAMESPACE KF5:: )
|
||||
install(EXPORT PlasmaQuickTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE PlasmaQuickTargets.cmake NAMESPACE KF5:: )
|
||||
|
11
src/plasmaquick/PlasmaQuickConfig.cmake.in
Normal file
11
src/plasmaquick/PlasmaQuickConfig.cmake.in
Normal file
@ -0,0 +1,11 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
# Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/PlasmaQuickTargets.cmake")
|
||||
|
||||
set(PlasmaQuick_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
|
||||
set_and_check(PlasmaQuick_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
|
||||
set(PlasmaQuick_LIBRARIES KF5::PlasmaQuick)
|
||||
|
@ -1,11 +0,0 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
# Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/PlasmaViewTargets.cmake")
|
||||
|
||||
set(PlasmaView_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
|
||||
set_and_check(PlasmaView_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
|
||||
set(PlasmaView_LIBRARIES KF5::PlasmaView)
|
||||
|
@ -78,7 +78,7 @@ target_link_libraries(plasma-shell
|
||||
${KWindowSystem_LIBRARIES}
|
||||
${KCoreAddons_LIBRARIES}
|
||||
plasma
|
||||
PlasmaView
|
||||
plasmaquick
|
||||
${Qt5Script_LIBRARIES}
|
||||
${KDE4Support_LIBRARIES}
|
||||
${Solid_LIBRARIES}
|
||||
|
Loading…
Reference in New Issue
Block a user