Commit 78457292 authored by Michael Abrahams's avatar Michael Abrahams

Do not include X11 on Windows

parent 063504c9
...@@ -449,10 +449,11 @@ QT5_WRAP_CPP(kritaui_HEADERS_MOC KisDocumentSectionPropertyAction_p.h) ...@@ -449,10 +449,11 @@ QT5_WRAP_CPP(kritaui_HEADERS_MOC KisDocumentSectionPropertyAction_p.h)
add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} ) add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} )
target_link_libraries(kritaui ${X11_X11_LIB} target_link_libraries(kritaui KF5::GlobalAccel KF5::KDELibs4Support)
${X11_Xinput_LIB} if (NOT WIN32)
KF5::GlobalAccel # for KisShortcutEditWidget.cpp target_link_libraries(kritaui ${X11_X11_LIB} ${X11_Xinput_LIB})
KF5::KDELibs4Support) endif()
if(APPLE) if(APPLE)
target_link_libraries(kritaui ${FOUNDATION_LIBRARY}) target_link_libraries(kritaui ${FOUNDATION_LIBRARY})
endif () endif ()
...@@ -464,11 +465,11 @@ else() ...@@ -464,11 +465,11 @@ else()
endif () endif ()
if(HAVE_OPENGL) if(HAVE_OPENGL)
target_link_libraries(kritaui ${OPENGL_LIBRARIES} Qt5::OpenGL Qt5::X11Extras ${OPENEXR_LIBRARIES}) target_link_libraries(kritaui ${OPENGL_LIBRARIES} Qt5::OpenGL ${OPENEXR_LIBRARIES})
# activate workaround for the VSync disable # Add VSync disable workaround
if(NOT WIN32) if(NOT WIN32)
target_link_libraries(kritaui ${CMAKE_DL_LIBS}) target_link_libraries(kritaui ${CMAKE_DL_LIBS} Qt5::X11Extras)
endif() endif()
set (GL_INTERFACE_LIBRARIES ";${OPENGL_LIBRARIES};Qt5::OpenGL") set (GL_INTERFACE_LIBRARIES ";${OPENGL_LIBRARIES};Qt5::OpenGL")
......
Markdown is supported
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