diff options
| author | Martin Müllenhaupt <mm@netlair.de> | 2014-10-08 08:44:34 (GMT) |
|---|---|---|
| committer | Martin Müllenhaupt <mm@netlair.de> | 2014-10-08 08:44:34 (GMT) |
| commit | 570c9ee42a3591b6736dd2a90300c600d14bf095 (patch) | |
| tree | c7a7d06c9efd149cfa09ef01bde425fe75a3c445 /src | |
| parent | 357e71356bc4030a7a06bc0e370d58c6acc75262 (diff) | |
| download | mxe-570c9ee42a3591b6736dd2a90300c600d14bf095.zip mxe-570c9ee42a3591b6736dd2a90300c600d14bf095.tar.gz mxe-570c9ee42a3591b6736dd2a90300c600d14bf095.tar.bz2 | |
package oce: fix static compilation #514
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmake/FindFreetype.cmake | 5 | ||||
| -rw-r--r-- | src/oce.mk | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/cmake/FindFreetype.cmake b/src/cmake/FindFreetype.cmake new file mode 100644 index 0000000..4f531ff --- /dev/null +++ b/src/cmake/FindFreetype.cmake @@ -0,0 +1,5 @@ +find_package(PkgConfig REQUIRED) + +pkg_check_modules(FREETYPE freetype2) + +set(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES}) #For compatibility @@ -25,9 +25,8 @@ define $(PKG)_BUILD -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE \ - -DFREETYPE_INCLUDE_DIRS=$(PREFIX)/$(TARGET)/include/freetype2 \ - -DFREETYPE_LIBRARY:STRING="`$(TARGET)-pkg-config --libs freetype2`" - + -DCMAKE_MODULE_PATH=$(PWD)/src/cmake + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' |