diff options
| author | مهدي شينون (Mehdi Chinoune) <79349457+MehdiChinoune@users.noreply.github.com> | 2022-04-15 09:34:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-15 15:34:24 +0700 |
| commit | 7efcf4f935d0466b6ada44bed62d729cd2cddbc4 (patch) | |
| tree | 5d132d314594015b825095a4a1e7537de6dfafed /cmake | |
| parent | 03495a4f95e325f8c7c1b5119c90032b7a52f3ae (diff) | |
| download | libgd-7efcf4f935d0466b6ada44bed62d729cd2cddbc4.tar.gz | |
Some fixes for MINGW (#828)
* Enable webpng on MINGW
* Detect GD version using cmake language
* Use _aligned_malloc instead of posix_memalign on Windows
* Include missing "errno.h"
* Fix finding WEBP on MINGW
* Fix finding XPM on MINGW
* Use PkgConfig to find packages on MINGW
* CI: Enable more options for MINGW
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindFontConfig.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindHEIF.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindWEBP.cmake | 9 | ||||
| -rw-r--r-- | cmake/modules/FindXPM.cmake | 7 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cmake/modules/FindFontConfig.cmake b/cmake/modules/FindFontConfig.cmake index afe967e..14c251c 100644 --- a/cmake/modules/FindFontConfig.cmake +++ b/cmake/modules/FindFontConfig.cmake @@ -37,11 +37,11 @@ endif ( FONTCONFIG_INCLUDE_DIR AND FONTCONFIG_LIBRARY ) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls -if( NOT WIN32 ) +if( NOT MSVC ) find_package(PkgConfig) pkg_check_modules(FONTCONFIG_PKG QUIET fontconfig) -endif( NOT WIN32 ) +endif( NOT MSVC ) FIND_PATH(FONTCONFIG_INCLUDE_DIR NAMES fontconfig/fontconfig.h PATHS diff --git a/cmake/modules/FindHEIF.cmake b/cmake/modules/FindHEIF.cmake index 1751a84..da544de 100644 --- a/cmake/modules/FindHEIF.cmake +++ b/cmake/modules/FindHEIF.cmake @@ -41,10 +41,10 @@ SET(HEIF_FOUND "NO") # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls -if( NOT WIN32 ) +if( NOT MSVC ) find_package(PkgConfig) pkg_check_modules(HEIF_PKG libheif>=1.7.0 QUIET) -endif( NOT WIN32 ) +endif( NOT MSVC ) FIND_PATH(HEIF_INCLUDE_DIR NAMES libheif/heif.h PATHS diff --git a/cmake/modules/FindWEBP.cmake b/cmake/modules/FindWEBP.cmake index cc93552..11076ed 100644 --- a/cmake/modules/FindWEBP.cmake +++ b/cmake/modules/FindWEBP.cmake @@ -37,11 +37,10 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -include(FindZLIB) - -find_path(WEBP_INCLUDE_DIR decode.h -/usr/local/include/webp -/usr/include/webp +find_path(WEBP_INCLUDE_DIR + NAMES decode.h + PATHS /usr/local/include /usr/include + PATH_SUFFIXES webp ) set(WEBP_NAMES ${WEBP_NAMES} webp) diff --git a/cmake/modules/FindXPM.cmake b/cmake/modules/FindXPM.cmake index 2cb0c22..8207103 100644 --- a/cmake/modules/FindXPM.cmake +++ b/cmake/modules/FindXPM.cmake @@ -40,9 +40,10 @@ SET(XPM_FOUND "NO") -FIND_PATH(XPM_XPM_INCLUDE_DIR xpm.h -/usr/local/include/X11 -/usr/include/X11 +FIND_PATH(XPM_XPM_INCLUDE_DIR + NAMES xpm.h + PATHS /usr/local/include /usr/include + PATH_SUFFIXES X11 ) SET(XPM_NAMES ${XPM_NAMES} Xpm libXpm) |