g2o

Clone
Source Code
GIT

#1 Update to version from 2018.03.31 (non-release)
Opened 4 years ago by nlimpert. Modified 4 years ago
nlimpert/g2o nlimpert/20180331  into  master

Merge
file modified
+167 -167 
@@ -18,11 +18,11 @@ 
 

  @@ -66,8 +66,8 @@ ENDIF()
 

   

   INSTALL(TARGETS csparse
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -33,11 +33,11 @@ 
 

  @@ -10,8 +10,8 @@ SET_TARGET_PROPERTIES(freeglut_minimal PROPERTIES OUTPUT_NAME ${LIB_PREFIX}ext_f
 

   

   INSTALL(TARGETS freeglut_minimal
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -48,11 +48,11 @@ 
 

  @@ -31,8 +31,8 @@ SET_TARGET_PROPERTIES(g2o_cli_application PROPERTIES OUTPUT_NAME g2o${EXE_POSTFI
 

   

   INSTALL(TARGETS g2o_cli_library g2o_cli_application
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -63,11 +63,11 @@ 
 

  @@ -29,8 +29,8 @@ SET_TARGET_PROPERTIES(g2o_hierarchical_application PROPERTIES OUTPUT_NAME g2o_hi
 

   

   # INSTALL(TARGETS g2o_hierarchical_library g2o_cli_application
 

-  #   RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -#   LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -#   ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +#   LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +#   ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+  #   RUNTIME DESTINATION bin
 

+ -#   LIBRARY DESTINATION lib
 

+ -#   ARCHIVE DESTINATION lib
 

+ +#   LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +#   ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   # )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -78,11 +78,11 @@ 
 

  @@ -55,8 +55,8 @@ SET_TARGET_PROPERTIES(g2o_anonymize_observations_application PROPERTIES OUTPUT_N
 

   

   INSTALL(TARGETS g2o_simulator_library g2o_simulator2d_application g2o_simulator3d_application g2o_anonymize_observations_application
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -93,11 +93,11 @@ 
 

  @@ -49,8 +49,8 @@ TARGET_LINK_LIBRARIES(g2o_viewer viewer_library)
 

   

   INSTALL(TARGETS g2o_viewer viewer_library
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -108,22 +108,22 @@ 
 

  @@ -17,8 +17,8 @@ TARGET_LINK_LIBRARIES(g2o_cli_application_linked types_slam2d types_slam3d types
 

   

   INSTALL(TARGETS g2o_cli_application_linked
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   

  @@ -43,8 +43,8 @@ IF(QT4_FOUND AND QGLVIEWER_FOUND)
 

   

     INSTALL(TARGETS g2o_viewer_linked
 

-      RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+      RUNTIME DESTINATION bin
 

+ -    LIBRARY DESTINATION lib
 

+ -    ARCHIVE DESTINATION lib
 

+ +    LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +    ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

     )
 

   ENDIF()
 

   
@@ -134,11 +134,11 @@ 
 

  @@ -43,8 +43,8 @@ TARGET_LINK_LIBRARIES(core stuff)
 

   

   INSTALL(TARGETS core
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -149,11 +149,11 @@ 
 

  @@ -14,8 +14,8 @@ SET_TARGET_PROPERTIES(g2o_incremental_application PROPERTIES OUTPUT_NAME g2o_inc
 

   

   INSTALL(TARGETS g2o_incremental_library g2o_incremental_application
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -164,11 +164,11 @@ 
 

  @@ -20,8 +20,8 @@ SET_TARGET_PROPERTIES(g2o_online_application PROPERTIES OUTPUT_NAME g2o_online${
 

   

   INSTALL(TARGETS g2o_interactive_library g2o_online_application
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -179,11 +179,11 @@ 
 

  @@ -13,8 +13,8 @@ SET_TARGET_PROPERTIES(test_slam_interface PROPERTIES OUTPUT_NAME test_slam_inter
 

   

   #INSTALL(TARGETS example_library
 

-    #RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  #LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  #ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  #LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  #ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    #RUNTIME DESTINATION bin
 

+ -  #LIBRARY DESTINATION lib
 

+ -  #ARCHIVE DESTINATION lib
 

+ +  #LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  #ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   #)
 

   

   #FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 
@@ -194,11 +194,11 @@ 
 

  @@ -23,8 +23,8 @@ TARGET_LINK_LIBRARIES(interface_library parser_library)
 

   

   INSTALL(TARGETS interface_library
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 
@@ -209,11 +209,11 @@ 
 

  @@ -29,8 +29,8 @@ SET_TARGET_PROPERTIES(parser_library PROPERTIES OUTPUT_NAME ${LIB_PREFIX}parser)
 

   

   INSTALL(TARGETS parser_library
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hh")
 
@@ -224,11 +224,11 @@ 
 

  @@ -12,8 +12,8 @@ TARGET_LINK_LIBRARIES(solver_cholmod ${CHOLMOD_LIBRARIES} ${BLAS_LIBRARIES} ${LA
 

   

   INSTALL(TARGETS solver_cholmod
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -239,14 +239,14 @@ 
 

  @@ -25,8 +25,8 @@ TARGET_LINK_LIBRARIES(solver_csparse csparse_extension core)
 

   

   INSTALL(TARGETS solver_csparse csparse_extension
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 

-  INSTALL(FILES ${headers} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/g2o/solvers/csparse)
 

+  INSTALL(FILES ${headers} DESTINATION include/g2o/solvers/csparse)
 

  diff --git a/g2o/solvers/dense/CMakeLists.txt b/g2o/solvers/dense/CMakeLists.txt
 

  index 5d41966..c0424ab 100644
 

  --- a/g2o/solvers/dense/CMakeLists.txt
 
@@ -254,11 +254,11 @@ 
 

  @@ -8,8 +8,8 @@ TARGET_LINK_LIBRARIES(solver_dense core)
 

   

   INSTALL(TARGETS solver_dense
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -269,14 +269,14 @@ 
 

  @@ -9,8 +9,8 @@ TARGET_LINK_LIBRARIES(solver_eigen core)
 

   

   INSTALL(TARGETS solver_eigen
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 

-  INSTALL(FILES ${headers} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/g2o/solvers/eigen)
 

+  INSTALL(FILES ${headers} DESTINATION include/g2o/solvers/eigen)
 

  diff --git a/g2o/solvers/pcg/CMakeLists.txt b/g2o/solvers/pcg/CMakeLists.txt
 

  index b29b333..77b2409 100644
 

  --- a/g2o/solvers/pcg/CMakeLists.txt
 
@@ -284,11 +284,11 @@ 
 

  @@ -10,8 +10,8 @@ TARGET_LINK_LIBRARIES(solver_pcg core)
 

   

   INSTALL(TARGETS solver_pcg
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -299,11 +299,11 @@ 
 

  @@ -11,8 +11,8 @@ TARGET_LINK_LIBRARIES(solver_slam2d_linear solver_csparse types_slam2d)
 

   

   INSTALL(TARGETS solver_slam2d_linear
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -314,11 +314,11 @@ 
 

  @@ -8,8 +8,8 @@ TARGET_LINK_LIBRARIES(solver_structure_only core)
 

   

   INSTALL(TARGETS solver_structure_only
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -329,22 +329,22 @@ 
 

  @@ -14,8 +14,8 @@ SET_TARGET_PROPERTIES(stuff PROPERTIES OUTPUT_NAME ${LIB_PREFIX}stuff)
 

   

   INSTALL(TARGETS stuff
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   # build our OpenGL helper library
 

  @@ -25,8 +25,8 @@ IF(OPENGL_FOUND AND G2O_HAVE_OPENGL)
 

     )
 

     INSTALL(TARGETS opengl_helper
 

-      RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+      RUNTIME DESTINATION bin
 

+ -    LIBRARY DESTINATION lib
 

+ -    ARCHIVE DESTINATION lib
 

+ +    LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +    ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

     )
 

     TARGET_LINK_LIBRARIES(opengl_helper ${OPENGL_LIBRARIES})
 

     SET_TARGET_PROPERTIES(opengl_helper PROPERTIES OUTPUT_NAME ${LIB_PREFIX}opengl_helper)
 
@@ -355,11 +355,11 @@ 
 

  @@ -19,8 +19,8 @@ ENDIF()
 

   

   INSTALL(TARGETS types_data
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -370,11 +370,11 @@ 
 

  @@ -31,8 +31,8 @@ TARGET_LINK_LIBRARIES(deprecated_types_slam3d ${OPENGL_gl_LIBRARY} core types_sl
 

   

   INSTALL(TARGETS deprecated_types_slam3d
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -385,11 +385,11 @@ 
 

  @@ -9,8 +9,8 @@ TARGET_LINK_LIBRARIES(types_icp types_sba types_slam3d)
 

   

   INSTALL(TARGETS types_icp
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -400,11 +400,11 @@ 
 

  @@ -10,8 +10,8 @@ TARGET_LINK_LIBRARIES(types_sba core types_slam3d)
 

   

   INSTALL(TARGETS types_sba
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -415,11 +415,11 @@ 
 

  @@ -16,8 +16,8 @@ ENDIF()
 

   

   INSTALL(TARGETS types_sclam2d
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -430,11 +430,11 @@ 
 

  @@ -9,8 +9,8 @@ TARGET_LINK_LIBRARIES(types_sim3 types_sba)
 

   

   INSTALL(TARGETS types_sim3
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -445,11 +445,11 @@ 
 

  @@ -25,8 +25,8 @@ ENDIF()
 

   

   INSTALL(TARGETS types_slam2d
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -460,11 +460,11 @@ 
 

  @@ -21,8 +21,8 @@ ENDIF()
 

   

   INSTALL(TARGETS types_slam2d_addons
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -475,11 +475,11 @@ 
 

  @@ -53,8 +53,8 @@ TARGET_LINK_LIBRARIES(test_slam3d_jacobian types_slam3d)
 

   

   INSTALL(TARGETS types_slam3d
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
@@ -490,11 +490,11 @@ 
 

  @@ -30,8 +30,8 @@ TARGET_LINK_LIBRARIES(test_line3d types_slam3d_addons types_slam3d)
 

   

   INSTALL(TARGETS types_slam3d_addons
 

-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 

- -  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- -  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 

- +  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

- +  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 

+    RUNTIME DESTINATION bin
 

+ -  LIBRARY DESTINATION lib
 

+ -  ARCHIVE DESTINATION lib
 

+ +  LIBRARY DESTINATION lib${LIB_SUFFIX}
 

+ +  ARCHIVE DESTINATION lib${LIB_SUFFIX}
 

   )
 

   

   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")

file modified
+13 -8 
@@ -1,7 +1,8 @@ 
 

- %global version_major 2017
 

- %global version_minor 07
 

- %global version_patch 30
 

- %global gittag %{version_major}%{version_minor}%{version_patch}_git
 

+ %global version_major 2018
 

+ %global version_minor 03
 

+ %global version_patch 31
 

+ %global githash 4841bb0c672dc103324174725c156dc7a89476fb
 

+ 

  Name:           g2o
 

  Version:        %{version_major}.%{version_minor}.%{version_patch}
 

  Release:        2%{?dist}
 
@@ -9,11 +10,11 @@ 
 

  

  License:        BSD
 

  URL:            https://github.com/RainerKuemmerle/g2o
 

- Source0:        https://github.com/RainerKuemmerle/g2o/archive/%{gittag}/%{name}-%{version}.tar.gz
 

+ Source0:        https://github.com/RainerKuemmerle/g2o/archive/%{githash}.tar.gz
 

  Patch0:         g2o.libsuffix.patch
 

  

- Conflicts:      ros-kinetic-libg2o
 

- Obsoletes:      ros-kinetic-libg2o <= 2016.4.24-1
 

+ Conflicts:      ros-libg2o
 

+ Obsoletes:      ros-libg2o <= 2017.07.30-1
 

  

  BuildRequires:  boost-devel
 

  BuildRequires:  cmake
 
@@ -29,7 +30,7 @@ 
 

  The libg2o library from http://openslam.org/g2o.html
 

  

  %prep
 

- %autosetup -p1 -n %{name}-%{gittag}
 

+ %autosetup -p1 -n %{name}-%{githash}
 

  

  %build
 

  mkdir -p obj-%{_target_platform} && cd obj-%{_target_platform}
 
@@ -49,6 +50,10 @@ 
 

  %{_includedir}/*
 

  

  %changelog
 

+ * Mon Feb 24 2020 Nicolas Limpert <limpert@fh-aachen.de> - 2018.03.31-1
 

+ - Update to version as provided by rosdistro
 

+ - Fix g2o.libsuffix.patch to patch accordingly
 

+ 

  * Wed Oct 09 2019 Till Hofmann <hofmann@kbsg.rwth-aachen.de> - 2017.07.30-2
 

  - Remove unnecessary Requires

As per subject. This is required in order to build the current melodic-devel (25abcf6) of the teb_local_planner.

Note that this does not use a release as upstream's maintainer did not create a new one. Instead it uses a commit close to the latest release of ros-gbp/libg2o-release.
Metadata
None
No Tags
Changes Summary 2
+167 -167
file changed
g2o.libsuffix.patch
+13 -8
file changed
g2o.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.