Codebase list dart / e021a66
Adapt patches Andreas Tille 4 years ago
5 changed file(s) with 4 addition(s) and 45 deletion(s). Raw diff Collapse all Expand all
+2
-4
debian/patches/0001-respect-cflags.patch less more
22 Last-Update: 2016-08-03
33 Forwarded: No
44
5 diff --git a/CMakeLists.txt b/CMakeLists.txt
6 index d3754c2..87d3c35 100644
75 --- a/CMakeLists.txt
86 +++ b/CMakeLists.txt
9 @@ -195,7 +195,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
7 @@ -207,7 +207,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
108 if(DART_FAST_DEBUG)
119 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1")
1210 endif()
1513 set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_DEBUG} -pg")
1614 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
1715
18 @@ -221,7 +221,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
16 @@ -233,7 +233,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHE
1917 if(DART_FAST_DEBUG)
2018 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1")
2119 endif()
+0
-32
debian/patches/0003-use-gnuinstalldir.patch less more
0 Description: Use GNUInstallDir
1 Author: Jose Luis Rivero <jrivero@osrfoundation.org>
2 Last-Update: 2019-01-27
3 Forwarded: No
4
5 diff --git a/CMakeLists.txt b/CMakeLists.txt
6 index d3754c2..bbae20c 100644
7 --- a/CMakeLists.txt
8 +++ b/CMakeLists.txt
9 @@ -25,9 +25,11 @@ if(POLICY CMP0053)
10 cmake_policy(SET CMP0053 NEW)
11 endif()
12
13 +include(GNUInstallDirs)
14 +
15 # Variables used in Components.cmake
16 -set(INCLUDE_INSTALL_DIR "include")
17 -set(LIBRARY_INSTALL_DIR "lib")
18 +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
19 +set(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
20 set(CONFIG_INSTALL_DIR "share/${PROJECT_NAME}/cmake")
21
22 # Set relative location to install additional documentation (sample data,
23 @@ -369,7 +371,7 @@ if(DART_VERBOSE)
24 message(STATUS ${PC_CONFIG_OUT})
25 endif()
26 configure_file(${PC_CONFIG_IN} ${PC_CONFIG_OUT} @ONLY)
27 -install(FILES ${PC_CONFIG_OUT} DESTINATION lib/pkgconfig)
28 +install(FILES ${PC_CONFIG_OUT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
29
30 # Install a Catkin 'package.xml' file. This is required by REP-136.
31 install(FILES package.xml DESTINATION share/${PROJECT_NAME})
+1
-5
debian/patches/0004-fix-pkgconfig.patch less more
22 Last-Update: 2019-01-28
33 Forwarded: No
44
5 diff --git a/CMakeLists.txt b/CMakeLists.txt
6 index d3754c2..276966a 100644
75 --- a/CMakeLists.txt
86 +++ b/CMakeLists.txt
9 @@ -60,7 +60,7 @@ set(DART_MINOR_VERSION "7")
7 @@ -64,7 +64,7 @@ set(DART_MINOR_VERSION "9")
108 set(DART_PATCH_VERSION "2")
119 set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSION}")
1210 set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.")
1513
1614 #===============================================================================
1715 # Build options
18 diff --git a/cmake/dart.pc.in b/cmake/dart.pc.in
19 index 90f3cde..1cf8eb8 100644
2016 --- a/cmake/dart.pc.in
2117 +++ b/cmake/dart.pc.in
2218 @@ -9,4 +9,4 @@ Description: @DART_PKG_DESC@
+1
-3
debian/patches/0006-Fix-find-Flann.patch less more
55 cmake/FindFLANN.cmake | 27 +--------------------------
66 1 file changed, 1 insertion(+), 26 deletions(-)
77
8 diff --git a/cmake/Findflann.cmake b/cmake/Findflann.cmake
9 index 804b904..675a852 100644
108 --- a/cmake/Findflann.cmake
119 +++ b/cmake/Findflann.cmake
1210 @@ -20,24 +20,4 @@
3028 -
3129 -# Set (NAME)_FOUND if all the variables and the version are satisfied.
3230 -include(FindPackageHandleStandardArgs)
33 -find_package_handle_standard_args(FLANN
31 -find_package_handle_standard_args(flann
3432 - FAIL_MESSAGE DEFAULT_MSG
3533 - REQUIRED_VARS FLANN_INCLUDE_DIRS FLANN_LIBRARIES
3634 - VERSION_VAR FLANN_VERSION)
+0
-1
debian/patches/series less more
00 0001-respect-cflags.patch
11 0002-fix-wamiktest-ndebug.patch
2 0003-use-gnuinstalldir.patch
32 0004-fix-pkgconfig.patch
43 0006-Fix-find-Flann.patch
54 0007-fix-soversion.patch