Edit for Mac: runtime/cpp_stl/CMakeLists.txt #27
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
On the Mac I was not able to link the symbols
iconv
,iconv_open
andiconv_close
called inruntime/cpp_stl/kaitaistream.cpp
. This was due to thefind_library ICONV_LIBRARIES
line inCMakeLists.txt
looking forlibiconv
, when on the Mac it needs to look foriconv
. The same line looks forc
so it was finding/usr/lib/libc
and not/usr/lib/libiconv
, which is installed.libc
of course can not resolve theiconv
symbols. I took outc
and addediconv
.I also added two lines to install the headers in a
kaitai
subdirectory (as the generated C++ files look forkaitai/kaitaistruct.h
). One line to addPUBLIC_HEADER
toset_target_properties
, and one line in theinstall
target to install the two.h
files.Tested on Mac and Linux but not Windows.