-
Notifications
You must be signed in to change notification settings - Fork 7.6k
[libe57] Add new port #18445
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
[libe57] Add new port #18445
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
5a2cbd8
[libe57] Add new port
maz-1 06b6449
remove deprecated entries
maz-1 23384be
update version files according to maintainer guide
maz-1 caf3cd1
add dependency for linux
maz-1 f954e0e
update cmake patch
maz-1 74ee37c
update versioning
maz-1 9723794
delete obsolete lines
maz-1 09847fd
fix linux/osx
maz-1 b8906a5
fix osx include and linker problem
maz-1 1c79814
[libe57] remove deprecated functions
maz-1 931da93
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| diff -Naur a/CMakeLists.txt b/CMakeLists.txt | ||
| --- a/CMakeLists.txt 2012-04-04 13:09:12.000000000 +0800 | ||
| +++ b/CMakeLists.txt 2021-06-16 01:14:35.669163100 +0800 | ||
| @@ -31,6 +31,8 @@ | ||
| set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) | ||
| set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake) | ||
|
|
||
| +set(CMAKE_POSITION_INDEPENDENT_CODE ON) | ||
| + | ||
| # Set a private module find path | ||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") | ||
|
|
||
| @@ -81,17 +83,17 @@ | ||
| endif(NOT Boost_FOUND) | ||
|
|
||
| set(Xerces_USE_STATIC_LIBS On) | ||
| -find_package(Xerces QUIET) | ||
| -if (NOT Xerces_FOUND) | ||
| +find_package(XercesC QUIET) | ||
| +if (NOT XercesC_FOUND) | ||
| set(XERCES_ROOT CACHE PATH "Location of the xerces library") | ||
| message(FATAL_ERROR | ||
| "Unable to find xerces library. | ||
| Please set the the XERCES_ROOT to point to the root of the xerces directory." | ||
| ) | ||
| -endif (NOT Xerces_FOUND) | ||
| +endif (NOT XercesC_FOUND) | ||
|
|
||
| -set(XML_LIBRARIES ${Xerces_LIBRARY}) | ||
| -set(XML_INCLUDE_DIRS ${Xerces_INCLUDE_DIR}) | ||
| +set(XML_LIBRARIES ${XercesC_LIBRARY}) | ||
| +set(XML_INCLUDE_DIRS ${XercesC_INCLUDE_DIR}) | ||
|
|
||
| if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | ||
| add_definitions(-DLINUX) | ||
| @@ -187,12 +189,18 @@ | ||
| add_executable( las2e57 | ||
| src/tools/las2e57.cpp | ||
| ) | ||
| + | ||
| +if (MSVC) | ||
| + set(LAS2E57_EXTRA_LINK bcrypt) | ||
| +endif(MSVC) | ||
| + | ||
| target_link_libraries( las2e57 | ||
| E57RefImpl | ||
| LASReader | ||
| time_conversion | ||
| ${XML_LIBRARIES} | ||
| ${CMAKE_THREAD_LIBS_INIT} | ||
| + ${LAS2E57_EXTRA_LINK} | ||
| ) | ||
| add_executable( e57fields | ||
| src/tools/e57fields.cpp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-1.1.312) | ||
| vcpkg_download_distfile(ARCHIVE | ||
| URLS "https://downloads.sourceforge.net/project/e57-3d-imgfmt/E57Refimpl-src/E57RefImpl_src-1.1.312.zip" | ||
| FILENAME "E57RefImpl_src-1.1.312.zip" | ||
| SHA512 c729cc3094131f115ddf9b8c24a9420c4ab9d16a4343acfefb42f997f4bf25247cd5563126271df2af95f103093b7f6b360dbade52c9e66ec39dd2f06e041eb7 | ||
| ) | ||
|
|
||
| vcpkg_extract_source_archive_ex( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| ARCHIVE ${ARCHIVE} | ||
| PATCHES | ||
| "0001_cmake.patch" | ||
| ) | ||
|
|
||
| vcpkg_configure_cmake( | ||
|
maz-1 marked this conversation as resolved.
Outdated
|
||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA | ||
| ) | ||
|
|
||
| file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/share/libe57) | ||
|
|
||
| vcpkg_install_cmake() | ||
|
maz-1 marked this conversation as resolved.
Outdated
|
||
| vcpkg_fixup_cmake_targets() | ||
|
maz-1 marked this conversation as resolved.
Outdated
|
||
| vcpkg_copy_pdbs() | ||
|
|
||
| vcpkg_copy_tools( | ||
| TOOL_NAMES e57fields e57unpack e57validate e57xmldump las2e57 | ||
| AUTO_CLEAN | ||
| ) | ||
|
|
||
| file(INSTALL ${SOURCE_PATH}/README.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) | ||
| file(INSTALL ${SOURCE_PATH}/src/refimpl/E57RefImplConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/e57refimpl/) | ||
|
|
||
| file(INSTALL ${SOURCE_PATH}/include/E57Simple.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/e57) | ||
| file(INSTALL ${SOURCE_PATH}/include/LASReader.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/e57) | ||
| file(INSTALL ${SOURCE_PATH}/include/time_conversion/time_conversion.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/e57/time_conversion) | ||
| file(INSTALL ${SOURCE_PATH}/include/time_conversion/basictypes.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/e57/time_conversion) | ||
| file(INSTALL ${SOURCE_PATH}/include/time_conversion/constants.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/e57/time_conversion) | ||
| file(INSTALL ${SOURCE_PATH}/include/time_conversion/gnss_error.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/e57/time_conversion) | ||
|
maz-1 marked this conversation as resolved.
Outdated
|
||
|
|
||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) | ||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) | ||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) | ||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) | ||
|
maz-1 marked this conversation as resolved.
Outdated
|
||
|
|
||
| file(REMOVE ${CURRENT_PACKAGES_DIR}/CHANGES.TXT) | ||
| file(REMOVE ${CURRENT_PACKAGES_DIR}/E57RefImplConfig.cmake) | ||
| file(REMOVE ${CURRENT_PACKAGES_DIR}/README.TXT) | ||
| file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/CHANGES.TXT) | ||
| file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/E57RefImplConfig.cmake) | ||
| file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/README.TXT) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "name": "libe57", | ||
| "version-semver": "1.1.312", | ||
| "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", | ||
| "homepage": "http://www.libe57.org/", | ||
| "dependencies": [ | ||
| "boost-crc", | ||
| "boost-filesystem", | ||
| "boost-format", | ||
| "boost-program-options", | ||
| "boost-system", | ||
| "boost-thread", | ||
| "boost-uuid", | ||
| "boost-variant", | ||
| { | ||
| "name": "icu", | ||
| "platform": "linux" | ||
| }, | ||
| "xerces-c" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "git-tree": "33740d7719efce750f00f8fb15d9e778aaf37c6e", | ||
| "version-semver": "1.1.312", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.