early-access version 2853
This commit is contained in:
78
externals/vcpkg/ports/octomap/001-fix-exported-targets.patch
vendored
Executable file
78
externals/vcpkg/ports/octomap/001-fix-exported-targets.patch
vendored
Executable file
@@ -0,0 +1,78 @@
|
||||
diff --git a/octomap/src/CMakeLists.txt b/octomap/src/CMakeLists.txt
|
||||
index 45b384f..ab1b6b1 100644
|
||||
--- a/octomap/src/CMakeLists.txt
|
||||
+++ b/octomap/src/CMakeLists.txt
|
||||
@@ -8,17 +8,16 @@ SET (octomap_SRCS
|
||||
OcTreeNode.cpp
|
||||
OcTreeStamped.cpp
|
||||
ColorOcTree.cpp
|
||||
- )
|
||||
+)
|
||||
+
|
||||
|
||||
-# dynamic and static libs, see CMake FAQ:
|
||||
-ADD_LIBRARY( octomap SHARED ${octomap_SRCS})
|
||||
-set_target_properties( octomap PROPERTIES
|
||||
+ADD_LIBRARY(octomap ${octomap_SRCS})
|
||||
+set_target_properties(octomap PROPERTIES
|
||||
VERSION ${OCTOMAP_VERSION}
|
||||
SOVERSION ${OCTOMAP_SOVERSION}
|
||||
+ OUTPUT_NAME "octomap"
|
||||
)
|
||||
-ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS})
|
||||
-SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap")
|
||||
-add_dependencies(octomap-static octomath-static)
|
||||
+
|
||||
|
||||
TARGET_LINK_LIBRARIES(octomap octomath)
|
||||
|
||||
@@ -26,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
|
||||
file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
|
||||
endif()
|
||||
|
||||
-export(TARGETS octomap octomap-static
|
||||
+export(TARGETS octomap
|
||||
APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
|
||||
|
||||
ADD_SUBDIRECTORY( testing )
|
||||
@@ -67,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_example octomap)
|
||||
ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp)
|
||||
TARGET_LINK_LIBRARIES(octree2pointcloud octomap)
|
||||
|
||||
-install(TARGETS octomap octomap-static
|
||||
+install(TARGETS octomap
|
||||
EXPORT octomap-targets
|
||||
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
diff --git a/octomap/src/math/CMakeLists.txt b/octomap/src/math/CMakeLists.txt
|
||||
index 3b47ec4..6a75170 100644
|
||||
--- a/octomap/src/math/CMakeLists.txt
|
||||
+++ b/octomap/src/math/CMakeLists.txt
|
||||
@@ -5,24 +5,22 @@ SET (octomath_SRCS
|
||||
)
|
||||
|
||||
|
||||
-ADD_LIBRARY( octomath SHARED ${octomath_SRCS})
|
||||
+ADD_LIBRARY(octomath ${octomath_SRCS})
|
||||
|
||||
SET_TARGET_PROPERTIES( octomath PROPERTIES
|
||||
VERSION ${OCTOMAP_VERSION}
|
||||
SOVERSION ${OCTOMAP_SOVERSION}
|
||||
)
|
||||
|
||||
-ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS})
|
||||
-SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath")
|
||||
|
||||
if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
|
||||
file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
|
||||
endif()
|
||||
|
||||
-export(TARGETS octomath octomath-static
|
||||
+export(TARGETS octomath
|
||||
APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
|
||||
|
||||
-install(TARGETS octomath octomath-static
|
||||
+install(TARGETS octomath
|
||||
EXPORT octomap-targets
|
||||
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
46
externals/vcpkg/ports/octomap/portfile.cmake
vendored
Executable file
46
externals/vcpkg/ports/octomap/portfile.cmake
vendored
Executable file
@@ -0,0 +1,46 @@
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO OctoMap/octomap
|
||||
REF v1.9.5
|
||||
SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
"001-fix-exported-targets.patch"
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DBUILD_TESTING=OFF
|
||||
-DBUILD_OCTOVIS_SUBPROJECT=OFF
|
||||
-DBUILD_DYNAMICETD3D_SUBPROJECT=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
vcpkg_copy_tools(
|
||||
TOOL_NAMES binvox2bt bt2vrml compare_octrees convert_octree edit_octree eval_octree_accuracy graph2tree log2graph
|
||||
AUTO_CLEAN)
|
||||
|
||||
vcpkg_fixup_cmake_targets()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
endif()
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/octomap")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
15
externals/vcpkg/ports/octomap/vcpkg-cmake-wrapper.cmake
vendored
Executable file
15
externals/vcpkg/ports/octomap/vcpkg-cmake-wrapper.cmake
vendored
Executable file
@@ -0,0 +1,15 @@
|
||||
_find_package(${ARGS})
|
||||
|
||||
if(TARGET octomap AND NOT TARGET octomap-static)
|
||||
add_library(octomap-static INTERFACE IMPORTED)
|
||||
set_target_properties(octomap-static PROPERTIES INTERFACE_LINK_LIBRARIES "octomap")
|
||||
|
||||
add_library(octomath-static INTERFACE IMPORTED)
|
||||
set_target_properties(octomath-static PROPERTIES INTERFACE_LINK_LIBRARIES "octomath")
|
||||
elseif(TARGET octomap-static AND NOT TARGET octomap)
|
||||
add_library(octomap INTERFACE IMPORTED)
|
||||
set_target_properties(octomap PROPERTIES INTERFACE_LINK_LIBRARIES "octomap-static")
|
||||
|
||||
add_library(octomath INTERFACE IMPORTED)
|
||||
set_target_properties(octomath PROPERTIES INTERFACE_LINK_LIBRARIES "octomath-static")
|
||||
endif()
|
||||
7
externals/vcpkg/ports/octomap/vcpkg.json
vendored
Executable file
7
externals/vcpkg/ports/octomap/vcpkg.json
vendored
Executable file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"name": "octomap",
|
||||
"version-string": "1.9.5",
|
||||
"port-version": 2,
|
||||
"description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees",
|
||||
"homepage": "https://octomap.github.io/"
|
||||
}
|
||||
Reference in New Issue
Block a user