Commit Graph

8 Commits

Author SHA1 Message Date
Maarten Bent
c80aecbfc1 CMake: Put include and link commands on one line
Use correct check for LIBICONV.
2018-12-02 17:45:43 +01:00
Maarten Bent
5017c6c8c2 CMake: expat code in separate file
Consistent with other external libraries.
2018-01-27 21:47:01 +01:00
Maarten Bent
f166d3b9c0 CMake: Don't use external project for wxexpat
This simplifies things a lot. And it is also not used for png, tiff and zlib.
2018-01-11 22:09:51 +01:00
Alexey Rassikhin
82da79d038 Workaround for expat builtin debug postfix
expat lib has debug postfix on windows only.
2017-12-15 13:59:57 +03:00
Alexey Rassikhin
6b15f19107 Fix expat config for "NMake Makefiles" target. 2017-12-15 11:53:50 +03:00
Vadim Zeitlin
6f23cea6df Fix the path of Expat library after move to submodules
It's in src/expat/expat now instead of being directly under src/expat.
2017-12-10 17:53:21 +01:00
Vadim Zeitlin
c66c9c5ae6 Merge branch 'build_cmake' of https://github.com/TcT2k/wxWidgets
Add CMake-based build system.

Merge the original branch without any changes except for resolving the
conflict due to moving the contents of .travis.yml to a separate file by
propagating the changes done in this file since then to the new script
and rerunning ./build/update-setup-h and ./build/cmake/update_files.py
to update the file lists changed in the meanwhile.

Closes https://github.com/wxWidgets/wxWidgets/pull/330
2017-12-09 15:09:47 +01:00
Tobias Taschner
da2b8ea812 Add CMake build system
Add CMake build system for libraries, tests and samples
update_files.py converts build/files into CMake format.
build/update-setup-h has been modified to update build/cmake/setup.h.in.
2017-01-03 20:53:10 +01:00