Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Tusooa Zhu
Krita
Commits
78457292
Commit
78457292
authored
Aug 17, 2015
by
Michael Abrahams
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not include X11 on Windows
parent
063504c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
krita/ui/CMakeLists.txt
krita/ui/CMakeLists.txt
+8
-7
No files found.
krita/ui/CMakeLists.txt
View file @
78457292
...
@@ -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"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment