lib/leptonica
1
0
Fork 0
mirror of https://github.com/DanBloomberg/leptonica.git synced 2026-10-23 15:28:56 +03:00
Code Activity

Revert "Avoid warning when several version of openjpeg are installed"

Browse Source
This commit is contained in:
Dan Bloomberg
2020-09-22 18:47:32 -07:00
committed by GitHub
parent e26c8ed0b5
commit 009efdda28
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/Configure.cmake
View File

@@ -145,15 +145,21 @@ file(APPEND ${AUTOCONFIG_SRC} "
/* Define to 1 if you have zlib. */
#cmakedefine HAVE_LIBZ 1
#if defined(HAVE_OPENJPEG_2_3_OPENJPEG_H)
#define LIBJP2K_HEADER <openjpeg-2.3/openjpeg.h>
#elif defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
#define LIBJP2K_HEADER <openjpeg-2.2/openjpeg.h>
#elif defined(HAVE_OPENJPEG_2_1_OPENJPEG_H)
#define LIBJP2K_HEADER <openjpeg-2.1/openjpeg.h>
#elif defined(HAVE_OPENJPEG_2_0_OPENJPEG_H)
#ifdef HAVE_OPENJPEG_2_0_OPENJPEG_H
#define LIBJP2K_HEADER <openjpeg-2.0/openjpeg.h>
#endif
#ifdef HAVE_OPENJPEG_2_1_OPENJPEG_H
#define LIBJP2K_HEADER <openjpeg-2.1/openjpeg.h>
#endif
#ifdef HAVE_OPENJPEG_2_2_OPENJPEG_H
#define LIBJP2K_HEADER <openjpeg-2.2/openjpeg.h>
#endif
#ifdef HAVE_OPENJPEG_2_3_OPENJPEG_H
#define LIBJP2K_HEADER <openjpeg-2.3/openjpeg.h>
#endif
")
########################################