diff options
| -rw-r--r-- | CMakeLists.txt | 82 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 25 | ||||
| -rw-r--r-- | config.h.cmake | 8 | ||||
| -rw-r--r-- | data/doc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/da/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/de/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/en/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | doc/es/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/et/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/fr/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/it/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/nl/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/pt/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/sv/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kdiff3plugin/CMakeLists.txt | 40 | ||||
| -rw-r--r-- | kdiff3plugin/po/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | man/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | po/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 88 | ||||
| -rw-r--r-- | src/kdiff3_part.cpp | 2 |
21 files changed, 283 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..c7a9edb --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,82 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +cmake_minimum_required( VERSION 2.8 ) + + +#### general package setup + +project( kdiff3 ) +set( VERSION R14.1.0 ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) + + +#### include our cmake modules + +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( src ) +add_subdirectory( kdiff3plugin ) +tde_conditional_add_subdirectory( BUILD_DOC man ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) +tde_conditional_add_subdirectory( BUILD_DOC data/doc ) +tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) +tde_conditional_add_subdirectory( BUILD_TRANSLATIONS kdiff3plugin/po ) + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..d1e3778 --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,25 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + +# required stuff +find_package( TQt ) +find_package( TDE ) + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + +tde_setup_largefiles( ) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY ) diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..61ede3a --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,8 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ diff --git a/data/doc/CMakeLists.txt b/data/doc/CMakeLists.txt new file mode 100644 index 0000000..21b72be --- /dev/null +++ b/data/doc/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _htmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html ) + +install( + FILES ${_htmls} + DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${PROJECT_NAME}/html +) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..6d0aa9f --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1 @@ +tde_auto_add_subdirectories( ) diff --git a/doc/da/CMakeLists.txt b/doc/da/CMakeLists.txt new file mode 100644 index 0000000..6121dc2 --- /dev/null +++ b/doc/da/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG da ) diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt new file mode 100644 index 0000000..eca4bd4 --- /dev/null +++ b/doc/de/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de ) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt new file mode 100644 index 0000000..8f0fe20 --- /dev/null +++ b/doc/en/CMakeLists.txt @@ -0,0 +1,8 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} ) + +file( GLOB _pngs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png ) + +install( + FILES ${_pngs} + DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${PROJECT_NAME}/html +) diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt new file mode 100644 index 0000000..7995d65 --- /dev/null +++ b/doc/es/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG es ) diff --git a/doc/et/CMakeLists.txt b/doc/et/CMakeLists.txt new file mode 100644 index 0000000..cf537d0 --- /dev/null +++ b/doc/et/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG et ) diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt new file mode 100644 index 0000000..495f168 --- /dev/null +++ b/doc/fr/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG fr ) diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt new file mode 100644 index 0000000..e213f2f --- /dev/null +++ b/doc/it/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG it ) diff --git a/doc/nl/CMakeLists.txt b/doc/nl/CMakeLists.txt new file mode 100644 index 0000000..39c20ab --- /dev/null +++ b/doc/nl/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG nl ) diff --git a/doc/pt/CMakeLists.txt b/doc/pt/CMakeLists.txt new file mode 100644 index 0000000..fa558f0 --- /dev/null +++ b/doc/pt/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG pt ) diff --git a/doc/sv/CMakeLists.txt b/doc/sv/CMakeLists.txt new file mode 100644 index 0000000..bc04ab0 --- /dev/null +++ b/doc/sv/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG sv ) diff --git a/kdiff3plugin/CMakeLists.txt b/kdiff3plugin/CMakeLists.txt new file mode 100644 index 0000000..adc17f0 --- /dev/null +++ b/kdiff3plugin/CMakeLists.txt @@ -0,0 +1,40 @@ +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} +) + + +##### libkdiff3plugin (kpart) + +tde_add_kpart( libkdiff3plugin AUTOMOC + + SOURCES + kdiff3plugin.cpp + LINK + konq + tdecore-shared + tdeui-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES kdiff3_plugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( + FILES kdiff3plugin.desktop + DESTINATION ${APPS_INSTALL_DIR}/.hidden +) diff --git a/kdiff3plugin/po/CMakeLists.txt b/kdiff3plugin/po/CMakeLists.txt new file mode 100644 index 0000000..7ff466b --- /dev/null +++ b/kdiff3plugin/po/CMakeLists.txt @@ -0,0 +1,5 @@ +file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) + +if( _srcs ) + tde_create_translation( LANG auto OUTPUT_NAME kdiff3_plugin ) +endif( ) diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt new file mode 100644 index 0000000..8512250 --- /dev/null +++ b/man/CMakeLists.txt @@ -0,0 +1,5 @@ +INSTALL( + FILES ${PROJECT_NAME}.1 + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..ad36a01 --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1,5 @@ +file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) + +if( _srcs ) + tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} ) +endif( ) 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; |