[libe57] Update to 1.1.337 #49656
[libe57] Update to 1.1.337 #49656
Conversation
SunBlack
force-pushed
the
libe57
branch
8 times, most recently
from
b297dda to
5b45f02
Compare
ports/libe57/xercesc.patch
Outdated
| -elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") | ||
| - add_definitions(-DWINDOWS) | ||
| -endif() | ||
| +find_package(XercesC REQUIRED) |
There was a problem hiding this comment.
| +find_package(XercesC REQUIRED) | |
| +find_package(XercesC REQUIRED) | |
| +set(XML_LIBRARIES XercesC::XercesC) |
and get rid of the other changes for the XML_LIBRARIES.
In any case, this needs a find_dependency(XercesC) in the installed cmake config.
There was a problem hiding this comment.
Tried it now and added a small test port. But how I can run the test port locally? Didn't found a parameter for vcpkg ci to tell him, I don't want build the whole repo.
There was a problem hiding this comment.
Use --overlay-ports scripts/test_ports to make the test ports available regular vcpkg install.
ports/libe57/portfile.cmake
Outdated
| # There is no license file in the repo yet, except a link to http://libe57.org/license.html" | ||
| set(VCPKG_POLICY_SKIP_COPYRIGHT_CHECK enabled) |
There was a problem hiding this comment.
The reference to the license URL can be written to copyright.
vicroms
left a comment
vicroms
left a comment
There was a problem hiding this comment.
Please apply dg0yt's suggestions
SunBlack
force-pushed
the
libe57
branch
6 times, most recently
from
2044f47 to
603e271
Compare
| ENDIF() | ||
| # FIXME: This probably should be set for both cases | ||
| - SET(E57RefImpl_LIBRARIES optimized ${E57RefImpl_LIBRARY_RELEASE} debug ${E57RefImpl_LIBRARY_DEBUG}) | ||
| + SET(E57RefImpl_LIBRARIES optimized ${E57RefImpl_LIBRARY_RELEASE} ${E57RefImpl_DEPENDENCIES} debug ${E57RefImpl_LIBRARY_DEBUG} ${E57RefImpl_DEPENDENCIES}) |
There was a problem hiding this comment.
optimized/debug only work for the next item. So you just append once, literally at the end of the E57RefImpl_LIBRARIES block (which is a poor select_library_configurations):
list(APPEND E57RefImpl_LIBRARIES
Boost::filesystem
Boost::system
XercesC::XercesC
)There was a problem hiding this comment.
Possible, this legacy syntax has long been removed from our projects, so I've slowly forgotten the details about it 😅
| -set(XML_LIBRARIES ${Xerces_LIBRARY}) | ||
| -set(XML_INCLUDE_DIRS ${Xerces_INCLUDE_DIR}) | ||
| +set(XML_LIBRARIES XercesC::XercesC) | ||
| +set(XML_INCLUDE_DIRS) |
There was a problem hiding this comment.
Nitpick, CMake quirk: This command unsets XML_INCLUDE_DIRS in the current scope. To really set an empty value and to hide the parent scope:
| +set(XML_INCLUDE_DIRS) | |
| +set(XML_INCLUDE_DIRS "") |
3 participants
./vcpkg x-add-version --alland committing the result.Notes:
copyright, but I think this makes no senseXercesC::XercesCinstead of patching the MacOS (CoreFoundation) and Linux (ICU) dependencies manually