dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add package flann.

Browse Source 
This is a prerequisite for PCL (Point Cloud Library).
pull/92/head
Martin Lambers 12 years ago
parent bbb8cb14a3
commit 27cb9ec7b6
5 changed files with 211 additions and 0 deletions
Show Stats Download Patch File Download Diff File

5
index.html
Unescape View File

@ -1063,6 +1063,11 @@ USE_OSGPLUGIN(<plugin2>)
<td id="flac-version">1.2.1</td>
<td id="flac-website"><a href="http://www.xiph.org/ogg/">FLAC</a></td>
</tr>
<tr>
<td id="flann-package">flann</td>
<td id="flann-version">1.7.1</td>
<td id="flann-website"><a href="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN">FLANN</a></td>
</tr>
<tr>
<td id="fltk-package">fltk</td>
<td id="fltk-version">1.3.1</td>

16
src/flann-1-fix-pkgconfig.patch
Unescape View File

@ -0,0 +1,16 @@
This file is part of MXE.
See index.html for further information.
Fix flann.pc to link with the static libraries.
diff -uNr flann-1.7.1-src/cmake/flann.pc.in flann-1.7.1-src.patched/cmake/flann.pc.in
--- flann-1.7.1-src/cmake/flann.pc.in 2011-12-23 12:16:09.000000000 +0100
+++ flann-1.7.1-src.patched/cmake/flann.pc.in 2012-10-01 12:46:31.617169719 +0200
@@ -8,6 +8,6 @@
Description: @PKG_DESC@
Version: @FLANN_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
-Libs: -L${libdir} -lflann_cpp -lflann_cpp-gd
+Libs: -L${libdir} -lflann_cpp_s -lflann_cpp_s-gd
Cflags: -I${includedir}

22
src/flann-2-disable-targets.patch
Unescape View File

@ -0,0 +1,22 @@
This file is part of MXE.
See index.html for further information.
Disable examples, test, and documentation in the CMakeLists.txt file.
(The file unfortunately does not provide switches for this purpose.)
diff -uNr flann-1.7.1-src/CMakeLists.txt flann-1.7.1-src.patched/CMakeLists.txt
--- flann-1.7.1-src/CMakeLists.txt 2011-12-23 12:16:09.000000000 +0100
+++ flann-1.7.1-src.patched/CMakeLists.txt 2012-10-01 12:32:59.865199865 +0200
@@ -143,9 +143,9 @@
add_subdirectory( cmake )
add_subdirectory( src )
-add_subdirectory( examples )
-add_subdirectory( test )
-add_subdirectory( doc )
+#add_subdirectory( examples )
+#add_subdirectory( test )
+#add_subdirectory( doc )
# CPACK options

144
src/flann-3-disable-sharedlibs.patch
Unescape View File

@ -0,0 +1,144 @@
This file is part of MXE.
See index.html for further information.
Disable building and installing dynamic libraries in the CMakeLists.txt file.
(The file unfortunately does not provide switches for this purpose.)
diff -uNr flann-1.7.1-src/src/cpp/CMakeLists.txt flann-1.7.1-src.patched/src/cpp/CMakeLists.txt
--- flann-1.7.1-src/src/cpp/CMakeLists.txt 2011-12-23 12:16:09.000000000 +0100
+++ flann-1.7.1-src.patched/src/cpp/CMakeLists.txt 2012-10-01 12:36:59.013191056 +0200
@@ -24,29 +24,29 @@
set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
endif()
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
- add_library(flann_cpp SHARED "")
- set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
-
- if (BUILD_CUDA_LIB)
- cuda_add_library(flann_cuda SHARED "")
- set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive)
- # target_link_libraries(flann_cuda cudpp_x86_64)
- endif()
-else()
- add_library(flann_cpp SHARED ${CPP_SOURCES})
- if (BUILD_CUDA_LIB)
- cuda_add_library(flann_cuda SHARED ${CPP_SOURCES})
- endif()
-endif()
-
-set_target_properties(flann_cpp PROPERTIES
- VERSION ${FLANN_VERSION}
- SOVERSION ${FLANN_SOVERSION}
- DEFINE_SYMBOL FLANN_EXPORTS
-)
+#if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+# add_library(flann_cpp SHARED "")
+# set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
+# target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+#
+# if (BUILD_CUDA_LIB)
+# cuda_add_library(flann_cuda SHARED "")
+# set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX)
+# target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive)
+# # target_link_libraries(flann_cuda cudpp_x86_64)
+# endif()
+#else()
+# add_library(flann_cpp SHARED ${CPP_SOURCES})
+# if (BUILD_CUDA_LIB)
+# cuda_add_library(flann_cuda SHARED ${CPP_SOURCES})
+# endif()
+#endif()
+#
+#set_target_properties(flann_cpp PROPERTIES
+# VERSION ${FLANN_VERSION}
+# SOVERSION ${FLANN_SOVERSION}
+# DEFINE_SYMBOL FLANN_EXPORTS
+#)
if (BUILD_CUDA_LIB)
set_target_properties(flann_cuda PROPERTIES
@@ -57,12 +57,12 @@
endif()
-#debug libraries
-add_library(flann_cpp-gd SHARED ${CPP_SOURCES})
-set_target_properties(flann_cpp-gd PROPERTIES
- COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}
- DEFINE_SYMBOL FLANN_EXPORTS
-)
+##debug libraries
+#add_library(flann_cpp-gd SHARED ${CPP_SOURCES})
+#set_target_properties(flann_cpp-gd PROPERTIES
+# COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}
+# DEFINE_SYMBOL FLANN_EXPORTS
+#)
add_library(flann_cpp_s-gd STATIC ${CPP_SOURCES})
set_target_properties(flann_cpp_s-gd PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
@@ -108,34 +108,35 @@
endif()
set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
- add_library(flann SHARED "")
- set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
- else()
- add_library(flann SHARED ${C_SOURCES})
- endif()
-
- set_target_properties(flann PROPERTIES
- VERSION ${FLANN_VERSION}
- SOVERSION ${FLANN_SOVERSION}
- DEFINE_SYMBOL FLANN_EXPORTS
- )
+# if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+# add_library(flann SHARED "")
+# set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
+# target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
+# else()
+# add_library(flann SHARED ${C_SOURCES})
+# endif()
+#
+# set_target_properties(flann PROPERTIES
+# VERSION ${FLANN_VERSION}
+# SOVERSION ${FLANN_SOVERSION}
+# DEFINE_SYMBOL FLANN_EXPORTS
+# )
endif()
if(WIN32)
if (BUILD_C_BINDINGS)
- install (
- TARGETS flann
- RUNTIME DESTINATION share/flann/matlab
- )
+# install (
+# TARGETS flann
+# RUNTIME DESTINATION share/flann/matlab
+# )
endif()
endif(WIN32)
install (
- TARGETS flann_cpp flann_cpp_s flann_cpp-gd flann_cpp_s-gd
+# TARGETS flann_cpp flann_cpp_s flann_cpp-gd flann_cpp_s-gd
+ TARGETS flann_cpp_s flann_cpp_s-gd
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
@@ -152,7 +153,8 @@
if (BUILD_C_BINDINGS)
install (
- TARGETS flann flann_s
+# TARGETS flann flann_s
+ TARGETS flann_s
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}

24
src/flann.mk
Unescape View File

@ -0,0 +1,24 @@
# This file is part of MXE.
# See index.html for further information.
PKG := flann
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 61b9858620528919ea60a2a4b085ccc2b3c2d138
$(PKG)_SUBDIR := flann-$($(PKG)_VERSION)-src
$(PKG)_FILE := flann-$($(PKG)_VERSION)-src.zip
$(PKG)_URL := http://people.cs.ubc.ca/~mariusm/uploads/FLANN/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
/bin/false
endef
define $(PKG)_BUILD
cd '$(1)' && cmake . \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_CUDA_LIB=OFF \
-DBUILD_MATLAB_BINDINGS=OFF \
-DBUILD_PYTHON_BINDINGS=OFF
$(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1
endef
Write Preview
Loading…
Cancel
Save