Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
KsirK
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Games
KsirK
Commits
b394733e
Commit
b394733e
authored
Jan 14, 2015
by
Raymond Wooninck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Qca to use the qt5 branch
REVIEW:122025
parent
2fb4cbcc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
CMakeLists.txt
CMakeLists.txt
+3
-3
ksirk/CMakeLists.txt
ksirk/CMakeLists.txt
+1
-2
ksirk/iris/src/CMakeLists.txt
ksirk/iris/src/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
b394733e
...
...
@@ -38,9 +38,9 @@ include(KDECMakeSettings)
add_definitions
(
-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS
)
add_definitions
(
-DTRANSLATION_DOMAIN=
"kbounce"
)
find_package
(
Phonon4Qt5 CONFIG REQUIRED
)
find_package
(
Qca 2.1.0
)
set_package_properties
(
Qca PROPERTIES DESCRIPTION
"Support for encryption"
URL
"http://d
elta.affinix.com/qca
"
find_package
(
Qca
-qt5
2.1.0
)
set_package_properties
(
Qca
-qt5
PROPERTIES DESCRIPTION
"Support for encryption"
URL
"http://d
ownload.kde.org/stable/qca-qt5
"
TYPE REQUIRED
)
kde_enable_exceptions
()
...
...
ksirk/CMakeLists.txt
View file @
b394733e
...
...
@@ -26,7 +26,6 @@ include_directories(
# ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/network/
# ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/
# ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/
${
QCA2_INCLUDE_DIR
}
)
link_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
/iris/
)
...
...
@@ -121,7 +120,7 @@ target_link_libraries(ksirk
KF5::KIOCore
Phonon::phonon4qt5
KF5::NewStuff
qca
qca
-qt5
iris_ksirk
KF5KDEGames
KF5KDEGamesPrivate
...
...
ksirk/iris/src/CMakeLists.txt
View file @
b394733e
...
...
@@ -134,7 +134,7 @@ endif()
add_library
(
iris_ksirk SHARED
${
libiris_SRCS
}
)
set
(
iris_ksirk_libs Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml
${
IDN_LIBRARY
}
qca
${
ZLIB_LIBRARIES
}
Qt5::Widgets
)
set
(
iris_ksirk_libs Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml
${
IDN_LIBRARY
}
qca
-qt5
${
ZLIB_LIBRARIES
}
Qt5::Widgets
)
if
(
WIN32
)
set
(
iris_ksirk_libs
${
iris_ksirk_libs
}
ws2_32
)
endif
(
WIN32
)
...
...
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