diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-04-10 06:51:50 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-04-10 06:51:50 (GMT) |
| commit | fb7932fb74530c0cf128ace31ffdcb0e1813d535 (patch) | |
| tree | ea15cc37345bc9cbc3bf45c3ca1b99663f929670 /src | |
| parent | fd0012b864aa6d536352222d7ba3ebba7c54230f (diff) | |
| parent | f6fb419f2314596e64e9402da8f9c3ed62b5d97c (diff) | |
| download | mxe-fb7932fb74530c0cf128ace31ffdcb0e1813d535.zip mxe-fb7932fb74530c0cf128ace31ffdcb0e1813d535.tar.gz mxe-fb7932fb74530c0cf128ace31ffdcb0e1813d535.tar.bz2 | |
Merge pull request #1287 from LuaAndC/vmime-prepare-for-cmake-3.5
vmime: prepare for cmake 3.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/vmime.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/vmime.mk b/src/vmime.mk index 411b140..9fa63d9 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -16,15 +16,14 @@ define $(PKG)_BUILD # The following hint is probably needed for ICU: # -DICU_LIBRARIES="`'$(TARGET)-pkg-config' --libs-only-l icu-i18n`" - cd '$(1)' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)' && '$(TARGET)-cmake' \ -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ -DVMIME_HAVE_MESSAGING_PROTO_SENDMAIL=False \ -DVMIME_HAVE_MLANG_H=False \ -DCMAKE_CXX_FLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \ - -DVMIME_BUILD_STATIC_LIBRARY=$(if $(BUILD_STATIC),ON,OFF) \ - -DVMIME_BUILD_SHARED_LIBRARY=$(if $(BUILD_SHARED),ON,OFF) \ + -DVMIME_BUILD_STATIC_LIBRARY=$(CMAKE_STATIC_BOOL) \ + -DVMIME_BUILD_SHARED_LIBRARY=$(CMAKE_SHARED_BOOL) \ -DVMIME_BUILD_SAMPLES=OFF \ -DVMIME_BUILD_DOCUMENTATION=OFF \ -DCMAKE_MODULE_PATH='$(1)/cmake' \ @@ -36,9 +35,9 @@ define $(PKG)_BUILD . $(MAKE) -C '$(1)' -j '$(JOBS)' - $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' $(1)/vmime.pc - $(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC /g' $(1)/vmime.pc) - $(MAKE) -C '$(1)' install + $(MAKE) -C '$(1)' -j 1 install + $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/vmime.pc' + $(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC /g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/vmime.pc') $(if $(BUILD_SHARED),$(INSTALL) -m644 '$(1)/build/bin/libvmime.dll' '$(PREFIX)/$(TARGET)/bin/') $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' |