diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lib/chmlib/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | lib/libchmfile/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.cpp | 4 | ||||
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.h | 6 | ||||
| -rw-r--r-- | lib/tdeio-msits/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | lib/tdeio-msits/msits.cpp | 2 | ||||
| -rw-r--r-- | lib/tdeio-msits/msits.h | 5 |
8 files changed, 108 insertions, 4 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 0000000..bc085ac --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory( libchmfile ) +tde_conditional_add_subdirectory( USE_BUILTIN_CHMLIB chmlib ) +tde_conditional_add_subdirectory( WITH_TDE tdeio-msits ) diff --git a/lib/chmlib/CMakeLists.txt b/lib/chmlib/CMakeLists.txt new file mode 100644 index 0000000..738a4b5 --- /dev/null +++ b/lib/chmlib/CMakeLists.txt @@ -0,0 +1,22 @@ +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} +) + + +##### chm (static) + +tde_add_library( chm STATIC_PIC + + SOURCES + chm_lib.c + lzx.c +) diff --git a/lib/libchmfile/CMakeLists.txt b/lib/libchmfile/CMakeLists.txt new file mode 100644 index 0000000..b56565f --- /dev/null +++ b/lib/libchmfile/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CHMLIB_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### chmfile (static) + +tde_add_library( chmfile STATIC_PIC + + SOURCES + libchmfile.cpp + libchmfile_search.cpp + libchmfileimpl.cpp + libchmtextencoding.cpp + libchmtocimage.cpp + + DESTINATION ${LIB_INSTALL_DIR} +) diff --git a/lib/libchmfile/libchmfileimpl.cpp b/lib/libchmfile/libchmfileimpl.cpp index c8e8801..39268b0 100644 --- a/lib/libchmfile/libchmfileimpl.cpp +++ b/lib/libchmfile/libchmfileimpl.cpp @@ -27,7 +27,11 @@ #include <tqapplication.h> #include "config.h" +#if USE_BUILTIN_CHMLIB #include "chm_lib.h" +#else +#include <chm_lib.h> +#endif #include "bitfiddle.h" #include "libchmfile.h" #include "libchmurlfactory.h" diff --git a/lib/libchmfile/libchmfileimpl.h b/lib/libchmfile/libchmfileimpl.h index c6558f7..c0a606f 100644 --- a/lib/libchmfile/libchmfileimpl.h +++ b/lib/libchmfile/libchmfileimpl.h @@ -19,9 +19,11 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - +#if USE_BUILTIN_CHMLIB #include "chm_lib.h" - +#else +#include <chm_lib.h> +#endif #include "libchmfile.h" #include "libchmtocimage.h" diff --git a/lib/tdeio-msits/CMakeLists.txt b/lib/tdeio-msits/CMakeLists.txt new file mode 100644 index 0000000..3f61de2 --- /dev/null +++ b/lib/tdeio-msits/CMakeLists.txt @@ -0,0 +1,42 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CHMLIB_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/lib/libchmfile +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### tdeio_msits (kpart) + +tde_add_kpart( tdeio_msits + + SOURCES + msits.cpp + LINK + tdeio-shared + tdecore-shared + ${CHMLIB_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES msits.protocol + DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( + FILES ${PROJECT_NAME}.desktop + DESTINATION ${APPS_INSTALL_DIR} +) diff --git a/lib/tdeio-msits/msits.cpp b/lib/tdeio-msits/msits.cpp index 28d2821..5a31c6c 100644 --- a/lib/tdeio-msits/msits.cpp +++ b/lib/tdeio-msits/msits.cpp @@ -40,7 +40,7 @@ using namespace TDEIO; extern "C" { - int kdemain( int argc, char **argv ) +KDE_EXPORT int kdemain( int argc, char **argv ) { kdDebug() << "*** tdeio_msits Init" << endl; diff --git a/lib/tdeio-msits/msits.h b/lib/tdeio-msits/msits.h index 4248908..6fb92f9 100644 --- a/lib/tdeio-msits/msits.h +++ b/lib/tdeio-msits/msits.h @@ -30,8 +30,11 @@ #include <tqcstring.h> #include "config.h" +#if USE_BUILTIN_CHMLIB #include "chm_lib.h" - +#else +#include <chm_lib.h> +#endif class ProtocolMSITS : public TDEIO::SlaveBase { |