diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-09-22 02:29:33 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-09-22 02:32:36 (GMT) |
| commit | 51db0500d1c48a9296497f23cebeaaabf60cc0bd (patch) | |
| tree | 361ca96dd9a21746c32bfcd08c344a0c54e0fbf0 /src | |
| parent | 866dddfaaf84f4d508fc5b3895b65c9af482ae2c (diff) | |
| download | mxe-51db0500d1c48a9296497f23cebeaaabf60cc0bd.zip mxe-51db0500d1c48a9296497f23cebeaaabf60cc0bd.tar.gz mxe-51db0500d1c48a9296497f23cebeaaabf60cc0bd.tar.bz2 | |
pkgconf: work around for buggy FindOpenSSL.cmake
FindOpenSSL.cmake bundled with cmake older than 2.8.12-rc1 uses
CMAKE_CROSS_COMPILING, which is incorrect because the real variable name
is CMAKE_CROSSCOMPILING. Because it is not possible to modify users'
CMake installation, work around it here.
This fixes building libwebsockets on Ubuntu 13.10. (I only tested 14.04
when merging the pull request.)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pkgconf.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pkgconf.mk b/src/pkgconf.mk index 9808056..a644be9 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -60,7 +60,8 @@ define $(PKG)_BUILD_COMMON echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ - echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ + echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")'; \ + echo 'set(CMAKE_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075') \ > '$(CMAKE_TOOLCHAIN_FILE)' endef |