diff options
author | gregory guy <[email protected]> | 2019-06-06 13:17:44 +0200 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2019-09-20 16:54:56 +0200 |
commit | ac4ae192354a1426f2711479cdfa15ca6ef3dfbf (patch) | |
tree | 88174bd36c629e5765f1e00d20ca56199b84bdf5 /src | |
parent | 1554e26b7cef373714e9d99bbe30c1be6521c363 (diff) | |
download | kdiff3-ac4ae192354a1426f2711479cdfa15ca6ef3dfbf.tar.gz kdiff3-ac4ae192354a1426f2711479cdfa15ca6ef3dfbf.zip |
conversion to the cmake building system
Signed-off-by: gregory guy <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 88 | ||||
-rw-r--r-- | src/kdiff3_part.cpp | 2 |
2 files changed, 89 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..c6def85 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,88 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kdiff3 (executable) + +tde_add_executable( ${PROJECT_NAME} AUTOMOC + + SOURCES + main.cpp + kdiff3_shell.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeparts-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### libkdiff3part (kpart) + +tde_add_kpart( libkdiff3part AUTOMOC + + SOURCES + kdiff3_part.cpp + kdiff3.cpp + directorymergewindow.cpp + merger.cpp + pdiff.cpp + difftextwindow.cpp + diff.cpp + optiondialog.cpp + mergeresultwindow.cpp + fileaccess.cpp + gnudiff_analyze.cpp + gnudiff_io.cpp + gnudiff_xmalloc.cpp + common.cpp + smalldialogs.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeprint-shared + tdeparts-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### icons + +tde_install_icons( ${PROJECT_NAME} ) + + +##### other data + +install( + FILES kdiff3_shell.rc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) + +install( + FILES kdiff3part.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( + FILES kdiff3_part.rc + DESTINATION ${DATA_INSTALL_DIR}/kdiff3part +) + +install( + FILES ${PROJECT_NAME}.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index e611425..82da11a 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -296,7 +296,7 @@ TDEInstance* KDiff3PartFactory::instance() } extern "C" -{ +{ KDE_EXPORT void* init_libkdiff3part() { return new KDiff3PartFactory; |