diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-10-09 04:37:30 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-10-09 04:37:30 (GMT) |
| commit | 5d8de0d66eb6aea8ca61950ef00f04d41a266d13 (patch) | |
| tree | 6a4a31dbde1497c8eb6d61442be6e7b477e3c603 /src | |
| parent | 743de090eff7a2c41a83a0680b0ff15e3b54940f (diff) | |
| parent | 3ce38c81386478e8a6d2225b792cdd94367a6da7 (diff) | |
| download | mxe-5d8de0d66eb6aea8ca61950ef00f04d41a266d13.zip mxe-5d8de0d66eb6aea8ca61950ef00f04d41a266d13.tar.gz mxe-5d8de0d66eb6aea8ca61950ef00f04d41a266d13.tar.bz2 | |
Merge pull request #519 from sikoragmbh/fix-514
package oce: fix static compilation #514
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmake/FindFreetype.cmake | 5 | ||||
| -rw-r--r-- | src/oce.mk | 6 | ||||
| -rw-r--r-- | src/pkgconf.mk | 1 |
3 files changed, 8 insertions, 4 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 @@ -24,10 +24,8 @@ define $(PKG)_BUILD -DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \ -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`" - + -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' diff --git a/src/pkgconf.mk b/src/pkgconf.mk index a644be9..55c9cf5 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -59,6 +59,7 @@ define $(PKG)_BUILD_COMMON echo 'set(HDF5_CXX_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5c++)'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)'; \ + echo 'set(CMAKE_MODULE_PATH $(PWD)/src/cmake) # For mxe FindPackage scripts'; \ 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_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075') \ |