Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SDK
KDiff3
Commits
676df294
Commit
676df294
authored
Jul 10, 2016
by
Michael Reeves
Browse files
*Apply automated fixes.
parent
a88834dc
Changes
18
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
676df294
cmake_minimum_required
(
VERSION 2.6
)
cmake_minimum_required
(
VERSION 2.
8.
6
)
project
(
kdiff3
)
find_package
(
ECM REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
)
include
(
KDEInstallDirs
)
include
(
KDECMakeSettings
)
include
(
ECMInstallIcons
)
find_package
(
KDE4 REQUIRED
)
include
(
MacroLibrary
)
SET
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/modules
)
...
...
@@ -8,8 +15,8 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod
add_definitions
(
${
QT_DEFINITIONS
}
${
KDE4_DEFINITIONS
}
)
include_directories
(
${
KDE4_INCLUDE_DIR
}
${
QT_INCLUDES
}
${
CMAKE_CURRENT_BINARY_DIR
}
)
...
...
@@ -24,7 +31,7 @@ add_subdirectory(src)
add_subdirectory
(
doc
)
find_file
(
KFILEITEMACTIONPLUGIN_FOUND kabstractfileitemactionplugin.h PATHS
${
KDE4_INCLUDE_DIR
}
NO_DEFAULT_PATH
)
find_file
(
KFILEITEMACTIONPLUGIN_FOUND kabstractfileitemactionplugin.h PATHS NO_DEFAULT_PATH
)
if
(
KFILEITEMACTIONPLUGIN_FOUND
)
message
(
STATUS
""
)
message
(
STATUS
"kabstractfileitemactionplugin.h found........... YES"
)
...
...
doc/da/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/da SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/da SUBDIR kdiff3
)
doc/de/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/de SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/de SUBDIR kdiff3
)
doc/en/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/en SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/en SUBDIR kdiff3
)
doc/es/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/es SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/es SUBDIR kdiff3
)
doc/et/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/et SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/et SUBDIR kdiff3
)
doc/fr/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/fr SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/fr SUBDIR kdiff3
)
doc/it/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/it SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/it SUBDIR kdiff3
)
doc/nl/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/nl SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/nl SUBDIR kdiff3
)
doc/pt/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/pt SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/pt SUBDIR kdiff3
)
doc/sv/CMakeLists.txt
View file @
676df294
kd
e4
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/sv SUBDIR kdiff3
)
kd
octools
_create_handbook
(
index.docbook INSTALL_DESTINATION
${
HTML_INSTALL_DIR
}
/sv SUBDIR kdiff3
)
kdiff3fileitemactionplugin/CMakeLists.txt
View file @
676df294
kde4_add_plugin
(
kdiff3fileitemaction kdiff3fileitemaction.cpp
)
target_link_libraries
(
kdiff3fileitemaction
${
KDE4_KIO_LIBS
}
${
LibKDiff3_LIBRARIES
}
)
add_library
(
kdiff3fileitemaction
MODULE
kdiff3fileitemaction.cpp
)
target_link_libraries
(
kdiff3fileitemaction
KF5::KIOCore
${
LibKDiff3_LIBRARIES
}
)
install
(
TARGETS kdiff3fileitemaction DESTINATION
${
PLUGIN_INSTALL_DIR
}
)
install
(
FILES kdiff3fileitemaction.desktop DESTINATION
${
SERVICES_INSTALL_DIR
}
)
kdiff3plugin/CMakeLists.txt
View file @
676df294
...
...
@@ -3,10 +3,10 @@ find_package(LibKonq REQUIRED)
set
(
kdiff3plugin_SRCS
kdiff3plugin.cpp
)
kde4_add_plugin
(
kdiff3plugin WITH_PREFIX
${
kdiff3plugin_SRCS
}
)
add_library
(
kdiff3plugin
MODULE
WITH_PREFIX
${
kdiff3plugin_SRCS
}
)
target_link_libraries
(
kdiff3plugin
${
KDE4_KDECORE_LIBS
}
${
KDE4_KPARTS_LIBS
}
konq
)
#
${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KIO_LIBRARY}
QtGui QtCore konq )
target_link_libraries
(
kdiff3plugin
KF5::KDELibs4Support KF5::Parts
konq
)
#
KF5::KIOCore
QtGui QtCore konq )
install
(
TARGETS kdiff3plugin DESTINATION
${
PLUGIN_INSTALL_DIR
}
)
...
...
src/CMakeLists.txt
View file @
676df294
...
...
@@ -23,11 +23,11 @@ set(kdiff3part_PART_SRCS
smalldialogs.cpp
progress.cpp
)
kde4_add_plugin
(
kdiff3part WITH_PREFIX
${
kdiff3part_PART_SRCS
}
)
add_library
(
kdiff3part
MODULE
WITH_PREFIX
${
kdiff3part_PART_SRCS
}
)
set_target_properties
(
kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART
)
target_link_libraries
(
kdiff3part
${
KDE4_KPARTS_LIBS
}
${
QT_QT3SUPPORT_LIBRARY
}
)
target_link_libraries
(
kdiff3part
KF5::Parts
${
QT_QT3SUPPORT_LIBRARY
}
)
install
(
TARGETS kdiff3part DESTINATION
${
PLUGIN_INSTALL_DIR
}
)
...
...
@@ -39,9 +39,9 @@ set(kdiff3_SRCS
${
kdiff3part_PART_SRCS
}
)
kde4_
add_executable
(
kdiff3
${
kdiff3_SRCS
}
)
add_executable
(
kdiff3
${
kdiff3_SRCS
}
)
target_link_libraries
(
kdiff3
${
KDE4_KPARTS_LIBS
}
${
QT_QT3SUPPORT_LIBRARY
}
)
target_link_libraries
(
kdiff3
KF5::Parts
${
QT_QT3SUPPORT_LIBRARY
}
)
install
(
TARGETS kdiff3
${
INSTALL_TARGETS_DEFAULT_ARGS
}
)
...
...
@@ -53,6 +53,18 @@ install( FILES kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part )
install
(
FILES kdiff3_shell.rc DESTINATION
${
DATA_INSTALL_DIR
}
/kdiff3
)
install
(
PROGRAMS kdiff3.desktop DESTINATION
${
XDG_APPS_INSTALL_DIR
}
)
kde4_install_icons
(
${
ICON_INSTALL_DIR
}
)
ecm_install_icons
(
ICONS
hicolor/16-apps-kdiff3.png
hicolor/32-apps-kdiff3.png
DESTINATION
${
ICON_INSTALL_DIR
}
THEME hicolor
)
ecm_install_icons
(
ICONS
lowcolor/16-apps-kdiff3.png
lowcolor/32-apps-kdiff3.png
DESTINATION
${
ICON_INSTALL_DIR
}
THEME locolor
)
src/hi16-app-kdiff3.png
→
src/hi
color/
16-app
s
-kdiff3.png
View file @
676df294
File moved
src/hi32-app-kdiff3.png
→
src/hi
color/
32-app
s
-kdiff3.png
View file @
676df294
File moved
src/lo16-app-kdiff3.png
→
src/lo
wcolor/
16-app
s
-kdiff3.png
View file @
676df294
File moved
src/lo32-app-kdiff3.png
→
src/lo
wcolor/
32-app
s
-kdiff3.png
View file @
676df294
File moved
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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