Commit 835f05b
committed
CMake: use our zlib, bzip2 and curl
This way CMake does not build its own versions, but rather uses Hashstack
versions. We also made sure the proper RPATH will be used in the `cmake`
executable via the CMAKE_PREFIX_PATH option.
Only three other libraries are still build as part of CMake: expat, jsoncpp,
libarchive, so we commented out options that disable them for now.
As a bonus, this patch also fixes a problem on OSX 10.10 where the curl
component of CMake fails to build with gcc (we now use Hashstack's version that
builds).1 parent 09ab7bc commit 835f05b
1 file changed
Lines changed: 13 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
3 | 6 | | |
4 | 7 | | |
5 | 8 | | |
6 | 9 | | |
7 | 10 | | |
8 | 11 | | |
9 | | - | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
10 | 22 | | |
11 | 23 | | |
12 | 24 | | |
| |||
0 commit comments