diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-11-21 09:21:40 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-11-21 09:21:40 +0000 |
| commit | b256cfd0fabfc1acfca2f23b91b026abcfb67cff (patch) | |
| tree | 4a75422355af613b1f2604398cab876124bcd582 /math/octomap/files | |
| parent | Update to 1.9.8 release. (diff) | |
math/octomap: Update 1.6.5-158 -> 1.9.0
Reported by: portscout
Diffstat (limited to 'math/octomap/files')
| -rw-r--r-- | math/octomap/files/patch-octomap_src_CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/math/octomap/files/patch-octomap_src_CMakeLists.txt b/math/octomap/files/patch-octomap_src_CMakeLists.txt index c28fe82274dc..96d382dd341f 100644 --- a/math/octomap/files/patch-octomap_src_CMakeLists.txt +++ b/math/octomap/files/patch-octomap_src_CMakeLists.txt @@ -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) |