Browse Source

Switch to Xext instead of xcb-shape.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/1/head
gregory guy 2 months ago
parent
commit
16f2716eef
No known key found for this signature in database GPG Key ID: 3BCCA0F7AB4536F4
3 changed files with 11 additions and 11 deletions
  1. +5
    -5
      ConfigureChecks.cmake
  2. +3
    -3
      client/CMakeLists.txt
  3. +3
    -3
      domino/CMakeLists.txt

+ 5
- 5
ConfigureChecks.cmake View File

@@ -38,13 +38,13 @@ if( NOT XFT_FOUND )
endif( NOT XFT_FOUND )


##### check for xcb-shape
##### check for Xext

pkg_search_module( XCB_SHAPE xcb-shape )
pkg_search_module( XEXT xext )

if( NOT XCB_SHAPE_FOUND )
tde_message_fatal("xcb-shape is required but was not found on your system" )
endif( NOT XCB_SHAPE_FOUND )
if( NOT XEXT_FOUND )
tde_message_fatal("Xext is required but was not found on your system" )
endif( NOT XEXT_FOUND )


##### check for freetype2


+ 3
- 3
client/CMakeLists.txt View File

@@ -8,13 +8,13 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${XCB_SHAPE_INCLUDE_DIRS}
${XEXT_INCLUDE_DIRS}
)

link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIBRARY_DIRS}
${XCB_SHAPE_LIBRARY_DIRS}
${XEXT_LIBRARY_DIRS}
)


@@ -28,7 +28,7 @@ tde_add_kpart( twin3_domino AUTOMOC
tdecore-shared
tdecorations-shared
${X11_LIBRARIES}
${XCB_SHAPE_LIBRARIES}
${XEXT_LIBRARIES}

DESTINATION ${PLUGIN_INSTALL_DIR}
)


+ 3
- 3
domino/CMakeLists.txt View File

@@ -6,7 +6,7 @@ include_directories(
${TQT_INCLUDE_DIRS}
${X11_INCLUDE_DIR}
${XFT_INCLUDE_DIRS}
${XCB_SHAPE_INCLUDE_DIRS}
${XEXT_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
)

@@ -15,7 +15,7 @@ link_directories(
${TDE_LIBRARY_DIRS}
${X11_LIBRARY_DIRS}
${XFT_LIBRARY_DIRS}
${XCB_SHAPE_LIBRARY_DIRS}
${XEXT_LIBRARY_DIRS}
${FREETYPE_LIBRARY_DIRS}
)

@@ -29,7 +29,7 @@ tde_add_library( domino_style STATIC_PIC AUTOMOC
LINK
tdecore-shared tdeui-shared tdeutils-shared
${X11_LIBRARIES} ${XFT_LIBRARIES}
${XCB_SHAPE_LIBRARIES} ${FREETYPE_LIBRARIES}
${X11_Xrender_LIB} ${FREETYPE_LIBRARIES}
)




Loading…
Cancel
Save