math/octomap: Update 1.6.5-158 -> 1.9.0

Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2018-11-21 09:21:40 +00:00
parent cc8c54ed2e
commit b256cfd0fa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=485505
3 changed files with 8 additions and 11 deletions

View file

@ -2,8 +2,7 @@
PORTNAME= octomap
DISTVERSIONPREFIX= v
DISTVERSION= v1.6.5-158
DISTVERSIONSUFFIX= -g23cb13f
DISTVERSION= 1.9.0
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1542694534
SHA256 (OctoMap-octomap-vv1.6.5-158-g23cb13f_GH0.tar.gz) = ff6f654b492b672b1a7ec39ccba4e29e1bdf215c318e388a22a3c78ab2fa34c7
SIZE (OctoMap-octomap-vv1.6.5-158-g23cb13f_GH0.tar.gz) = 1682523
TIMESTAMP = 1542791562
SHA256 (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd
SIZE (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 1682421

View file

@ -1,19 +1,17 @@
--- octomap/src/CMakeLists.txt.orig 2018-11-20 06:33:58 UTC
--- octomap/src/CMakeLists.txt.orig 2017-04-28 19:49:53 UTC
+++ octomap/src/CMakeLists.txt
@@ -16,9 +16,9 @@ set_target_properties( octomap PROPERTIE
@@ -16,8 +16,8 @@ set_target_properties( octomap PROPERTIE
VERSION ${OCTOMAP_VERSION}
SOVERSION ${OCTOMAP_SOVERSION}
)
-ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS})
-SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap")
-add_dependencies(octomap-static octomath-static)
+#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 +26,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI
@@ -25,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI
file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
endif()
@ -22,7 +20,7 @@
APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
ADD_SUBDIRECTORY( testing )
@@ -67,7 +67,7 @@ TARGET_LINK_LIBRARIES(intersection_examp
@@ -66,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_examp
ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp)
TARGET_LINK_LIBRARIES(octree2pointcloud octomap)