diff options
| author | gregory guy <g-gregory@gmx.fr> | 2019-05-01 14:48:25 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-05-12 17:38:05 +0200 |
| commit | 66815c9c1679da40b1454d1faf05b353004aab13 (patch) | |
| tree | 9fe635d75c4dc546e77f81c0db244173101f2965 /lib/libchmfile | |
| parent | ae17ec2cc9146ec253c6b93e87b1394d178873a6 (diff) | |
| download | kchmviewer-66815c9c1679da40b1454d1faf05b353004aab13.tar.gz kchmviewer-66815c9c1679da40b1454d1faf05b353004aab13.zip | |
conversion to the cmake building system
Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit db17d12f24fab5ed233b222c90000e3c0081f99d)
Diffstat (limited to 'lib/libchmfile')
| -rw-r--r-- | lib/libchmfile/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.cpp | 4 | ||||
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.h | 6 |
3 files changed, 36 insertions, 2 deletions
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" |