blob: 11b129c0c1075520cd61cc7d5beb9bb5b9fbe415 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 91ffd2fb6f9c5ed3017af5363b3f14313a45ea9c Mon Sep 17 00:00:00 2001
From: MXE
Date: Mon, 18 Jun 2012 13:23:21 +0200
Subject: [PATCH 1/2] fixes for mxe
diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
index e48b21e..1198139 100644
--- a/cmake/WtFindBoost-vintage.txt
+++ b/cmake/WtFindBoost-vintage.txt
@@ -70,6 +70,7 @@ ELSE(MSVC)
boost_thread-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION}
boost_thread-${BOOST_COMPILER}-mt
+ boost_thread${BOOST_COMPILER}-mt
boost_thread-mt-${BOOST_VERSION}
boost_thread-mt
boost_thread-${BOOST_COMPILER}-${BOOST_VERSION}
diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
index 76697fc..9bc0fa1 100644
--- a/cmake/WtFindGm.txt
+++ b/cmake/WtFindGm.txt
@@ -59,6 +59,12 @@ IF(WIN32)
ELSE(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR)
SET(GM_FOUND FALSE)
ENDIF(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR)
+
+ IF(GM_INCLUDE_DIR AND GM_LIBS)
+ SET(GM_FOUND TRUE)
+ SET(GM_INCLUDE_DIRS ${GM_INCLUDE_DIR})
+ SET(GM_LIBRARIES optimized ${GM_LIBS})
+ ENDIF(GM_INCLUDE_DIR AND GM_LIBS)
ELSE(WIN32)
FIND_LIBRARY(GM_LIB
NAMES
diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
index cd1e640..b1bbe3d 100644
--- a/cmake/WtFindPangoFt2.txt
+++ b/cmake/WtFindPangoFt2.txt
@@ -36,11 +36,15 @@ SET(PANGO_FT2_INCLUDE_DIRS
${GLIB2_INCLUDE_DIR}
${GLIB2_CONFIG_INCLUDE_DIR})
-SET(PANGO_FT2_LIBRARIES
- ${PANGO_FT2_LIBRARY}
- ${PANGO_LIBRARY}
- ${GOBJECT2_LIBRARY}
- ${GLIB2_LIBRARY})
+IF(PANGO_FT2_LIBS)
+ SET(PANGO_FT2_LIBRARIES optimized ${PANGO_FT2_LIBS})
+ELSE(PANGO_FT2_LIBS)
+ SET(PANGO_FT2_LIBRARIES
+ ${PANGO_FT2_LIBRARY}
+ ${PANGO_LIBRARY}
+ ${GOBJECT2_LIBRARY}
+ ${GLIB2_LIBRARY})
+ENDIF(PANGO_FT2_LIBS)
IF (PANGO_INCLUDE_DIR
AND FT2_INCLUDE_DIR
diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
index d99f1df..7c1f70b 100644
--- a/cmake/WtFindSsl.txt
+++ b/cmake/WtFindSsl.txt
@@ -109,6 +109,11 @@ IF(WIN32)
AND SSL_LIB_DEBUG
AND SSL_TOO_LIB_RELEASE
AND SSL_TOO_LIB_DEBUG)
+
+ IF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
+ SET(SSL_FOUND true)
+ SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS})
+ ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
ELSEIF(APPLE)
FIND_LIBRARY(SSL_LIB
NAMES
--
1.9.3 (Apple Git-50)
|
