-
Notifications
You must be signed in to change notification settings - Fork 7.3k
[pdal] no absolute paths #21723
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
[pdal] no absolute paths #21723
Conversation
|
Also depends on #20439 |
|
Don't modernize outdated pdal too much. There is #21275. |
|
Ah sorry, I only changed vcpkg_configure_cmake to vcpkg_cmake_configure etc. and added some quotes. But I can revert this changes |
4a1b2dd to
5bacd5d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 3a68454afa67bde8b6e9e741536daa95d3785966 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json
index ce07dbb..5b8e572 100644
--- a/versions/p-/pdal.json
+++ b/versions/p-/pdal.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "5364286a04b7e776f8d82f3f7db014b5649d87d3",
+ "git-tree": "80a1aa579f0a9a8d5468cc9a9d1f6a2ada45987c",
"version": "1.7.1",
"port-version": 14
},You have modified or added at least one portfile where deprecated functions are used.
Details
If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
In the ports that use the new function, you have to add the corresponding dependencies:
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}The following files are affected:
ports/pdal/portfile.cmake
5bacd5d to
3f84e32
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one portfile where deprecated functions are used.
Details
If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
In the ports that use the new function, you have to add the corresponding dependencies:
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}The following files are affected:
ports/pdal/portfile.cmake
dg0yt
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about putting this PR in draft state? I will take it as a check list for the PDAL update.
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") # dependency gdal has no pkgconfig files | ||
|
|
||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pdal/Dimension.hpp" "${SOURCE_PATH}" "") | ||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pdal/pdal_features.hpp" "#define PDAL_PLUGIN_INSTALL_PATH \"${CURRENT_PACKAGES_DIR}/bin\"" "") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is probaly safe to define PDAL_PLUGIN_INSTALL_PATH as ".".
| find_package(PDAL CONFIG REQUIRED) | ||
| target_link_libraries(main PRIVATE pdalcpp pdal_util pdal_arbiter pdal_kazhdan) | ||
|
|
||
| Add the following cmake code to your CMakeLists.txt to create definitions for DCMTK |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is PDAL, not DCMTK.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In addition, I think it would be better to handle PDAL_PLUGIN_INSTALL_PATH in the config files.
| else() | ||
| target_compile_definitions(main | ||
| PUBLIC | ||
| "PDAL_PLUGIN_INSTALL_PATH=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I doubt that bin is the right path for linux or osx. I would prefer to not add non-portable instructions.
Ok good, then the |
For #20469