Commit Graph

33 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
46c6f4de67 Update local boost version to version 1.62
This avoids some warnings with gcc6.
2016-10-19 17:33:41 +02:00
Georg Baum
c7bfa7d341 Fix linking with cmake and included iconv
Previously, the GNU linker would complain about missing libcharset_relocate.
The MSVC linker did not complain, since the code that uses libcharset_relocate
does not seem to be sued, so it removed it.
2016-07-03 18:51:22 +02:00
Georg Baum
9dcb7860b4 Remove unneeded MSVC 6 project file
We use cmake or autotools to build hunspell, so we don't need this.
2016-06-26 18:58:19 +02:00
Georg Baum
d32f8f326a Fix boost packaging
icu.{hpp,cpp} is not needed and cannot be compiled since it depends on libicu.
The other two files are currently not used, but could be in principle, so I
added them to the build.
2016-06-15 22:21:21 +02:00
Georg Baum
d67a8cb212 Do not try to build an empty boost lib
This should fix a build failure on OS X:
Making all in boost
  AR       liblyxboost.a
  ar: no archive members specified
2016-06-11 09:28:11 +02:00
Georg Baum
2047ea5eb4 Replace Boost.Signals with Boost.Signals2
Boost.Signals is deprecated. This fixes bug #9943.
The only thing left to do is to rewrite (or get rid of) the boost -mt test
in config/lyxinclude.m4 not to use signals anymore.
2016-06-09 22:25:34 +02:00
Georg Baum
fe86240d64 Rerun extract.sh to get rid of more boost
After the latest changes we require less parts of boost, but unfortunaly the
effect is only small.
2016-06-09 20:47:19 +02:00
Guillaume Munch
b95b77c631 Replace boost::tuple with std::tuple 2016-06-09 15:21:39 +01:00
Guillaume Munch
ca8709aaf5 Replace boost::scoped_ptr with unique_ptr 2016-06-09 15:21:39 +01:00
Georg Baum
3611d90ffe We do not use the provided MSVC proj files 2016-06-07 22:19:10 +02:00
Georg Baum
7d558d3e2a Remove boost::typeof
Jean-Marc found out that we do not need it.
2016-06-07 22:10:49 +02:00
Georg Baum
2a3efc1585 Update boost to version 1.61
I updated using the new extract script. This gets rid of boost::bind, but the
other parts are still needed internally.
2016-06-07 21:14:12 +02:00
Georg Baum
bdbe81be15 Remove unneeded files from extract.sh
We do require less files from boost now.
2016-06-07 21:10:19 +02:00
Jean-Marc Lasgouttes
d0a318c742 We do not use <boost/scoped_array.hpp> anymore
The code using it  was removed at 81959251.
2016-05-29 17:55:45 -04:00
Jean-Marc Lasgouttes
5ee778af75 Remove support/metahash.h
It turns out that it did not take off since introduced in 2011. It is better to remove it and the associated boost headers (extract.sh was run against boost 1.60 to do the update).

Since we will move away from several boost classes when transitioning to C++11, it is good to start by removing lesser used ones.
2016-05-29 17:55:45 -04:00
Jean-Marc Lasgouttes
68a1f9a44e Do not use of boost::tokenizer
It is easier to use instead getVectorFromString for the use we have of this tokenizer. The two places are environment.cpp (path stuff) and qt_helpers (file fileters). The new code is much shorter.

This allow to remove boost/tokenizer.hpp and friends from our boost tree.
2016-05-29 17:55:45 -04:00
Jean-Marc Lasgouttes
87d4ce0ff7 Remove boost/format support
Only ChkTex.cpp used it, whereas the rest of our code uses the simpler bformat.
2016-05-29 17:55:45 -04:00
Georg Baum
f434fd22b1 Configure included hunspell with autotools
The included hunspell should not be used on Linux or OS X, but (depending on
local configuration) it might be needed for crosscompiling a mingw target
from Linux. Now the user can choose whether to use the included hunspell or not.
cmake does already support that.

Now the only other dependency you need to cross-compile for mingw on debian
or ubuntu is qt.
2016-05-29 17:55:44 -04:00
Georg Baum
08afc52c4c Configure included iconv with autotools
The included iconv should not be used on Linux or OS X, but (depending on
local configuration) it might be needed for crosscompiling a mingw target
from Linux. Now the user can choose whether to use the included iconv or not.
cmake does already support that.

eilseq.m4 was taken from the original libiconv 1.14 package.
2016-05-29 17:55:43 -04:00
Georg Baum
127e5b1955 Add forgotten zlib includes
I forgot this in 9b822b25ae5. Also remove a comment that is no longer true.
2016-05-29 17:55:43 -04:00
Georg Baum
78e17b1579 Configure included zlib with autotools
The included zlib should not be used on Linux or OS X, but (depending on
local configuration) it might be needed for crosscompiling a mingw target
from Linux. Now the user can choose whether to use the included zlib or not.
cmake does already support that.

zconf.h.in was taken from the original zlib 1.2.8 package. The generation of
zconf.h was made equivalent to the one generated by cmake.
2016-05-29 17:55:43 -04:00
Peter Kümmel
fc459bd977 files are already part of boost 2016-02-16 11:00:34 +01:00
Peter Kümmel
6de524e6cf Add missing boost files to source package
and remove Visual Studio files, we build with CMake on Windows.
2016-02-13 19:03:42 +01:00
Georg Baum
ff9ba203ff Add missing files to source package
The windows build for beta1 showed that some files were missing by accident.
2016-02-11 21:04:58 +01:00
Peter Kümmel
132cc83871 remove warning about alreday defined Z_PREFIX 2016-01-19 17:54:43 +01:00
Peter Kümmel
dde4f93894 zlib: enable prefix, fix mingw build 2016-01-12 20:11:31 +01:00
Jean-Marc Lasgouttes
a69d649626 Do not setup building of 3rdparty/libiconv
This causes build problems with automake < 1.14 because two files have the same name. This only works well when using subdir-objects, which we only do after 1.14.

We do not want to build libiconv on target which support autotools anyway, but rely on a built-in one.

This fixes building on oldish ubuntu 12.04.
2016-01-01 18:44:18 +01:00
Peter Kümmel
bd74a15ebd update boost to 1.60 2015-12-20 14:04:54 +01:00
Peter Kümmel
3c3141dc23 3rdparty/boost: build with cmake 2015-12-20 13:41:00 +01:00
Peter Kümmel
a8d78905b6 3rdparty/boost: build with autotools 2015-12-20 13:06:59 +01:00
Peter Kümmel
b7a3831289 move boost to 3rdparty directory 2015-12-20 12:49:10 +01:00
Georg Baum
c829eeebb7 Add 3rdparty to source package
The new 3rdparty libraries are not added to the autotools build system, so
that they appear in the source package. They cannot be compiled yet with
autotools (although this would make sense for cross compilation with mingw),
but adding configure support for enabling/disabling these like we do for
boost is a bit more work, so I did not do it for now. Nevertheless, the
three new Makefile.am are already prepared for compilation.
2015-12-19 16:49:52 +01:00
Peter Kümmel
3bd2cfecf0 move 3rdparty dir out of src/ 2015-12-15 13:20:13 +01:00