Commit 838f7fc
committed
vcpkg build fixes, attempt 2/2
'vcpkg install io2d' was not working when building a Debug copy of io2d,
as 'd'ebug versions of certain libraries, namely Cairo, LibPNG, and
zlib, could not be found. Each of those libraries, on Windows, had
different library names, if and when a Debug copy was used. For
example, "cairod" for Debug, "cairo" for Release. When building the
Debug copy of io2d, it would not find the 'd' versions of these
libraries, which caused CMake to fail during its 'config' stage. The Release copy of io2d would pass cmake configuration, but not the Debug copy.
Fix attempt 1, which is-being (or by now, perhaps, has-been) rescinded,
tried to ignore 'd' versions of libraries. This got 'vcpkg install
io2d' working, however it caused problems when building and running
io2d standalone, using older build instructions (that involved running
CMake manually, then building io2d.sln manually). The problems involved
.dll files that could not be found.
Fix attempt 2 (this one!), does two things:
1. it doesn't attempt to directly link to LibPNG and zlib, when using
MSVC. This is unnecessary, as GraphicsMagick is suitably-used instead.
2. for Cairo, it looks for both 'd' (Debug) and not-'d' (Release)
libraries, however, if the 'd' version is not found, it'll fall back to
using the not-'d' version.
The two things above combine to allow vcpkg to successfully configure,
then build io2d, while allowing io2d to also be built manually.1 parent 980a14c commit 838f7fc
File tree
2 files changed
+6
-7
lines changed- P0267_RefImpl/P0267_RefImpl/cairo
- win32
2 files changed
+6
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
50 | 55 | | |
51 | 56 | | |
52 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
35 | 33 | | |
36 | | - | |
37 | | - | |
38 | 34 | | |
39 | 35 | | |
40 | 36 | | |
41 | 37 | | |
42 | 38 | | |
43 | 39 | | |
44 | 40 | | |
45 | | - | |
46 | | - | |
47 | 41 | | |
48 | 42 | | |
49 | 43 | | |
| |||
0 commit comments