Commit Graph

10 Commits

Author SHA1 Message Date
Luke Street 04cbd546b7 Merge remote-tracking branch 'origin/master' into hsh
# Conflicts:
#	atdna/FindLLVM.cmake
#	extern/zlib/CMakeLists.txt
2021-01-06 14:17:43 -05:00
Luke Street b690d4d7da Update zlib from 1.2.7 to 1.2.11 2020-10-21 00:21:31 -04:00
Phillip Stephens 347d807a23
Fix zlib 2020-06-13 20:44:15 -07:00
Luke Street 0bc400b4d9 extern/zlib: Use find_library 2020-06-13 17:18:23 -04:00
Luke Street dec27c05ed Use CMake MSVC_RUNTIME_LIBRARY to control MSVC flags 2020-05-27 21:37:03 -04:00
Jack Andersen f381eb3059 minor CMake change 2015-11-17 10:37:08 -10:00
Jack Andersen a16fd79838 OS X support for atdna macro; dependency resolution fix 2015-09-02 08:49:23 -10:00
Jack Andersen 55adeec69c windows packaging and CMake adjustments 2015-07-10 16:14:06 -10:00
Jack Andersen 8ca702785c added icons; updated PKGBUILD for CMake 2015-07-08 10:21:50 -10:00
Jack Andersen ce917d4aca Added CMakeLists.txt 2015-07-06 17:23:37 -10:00