View | Details | Raw Unified | Return to bug 249152
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 15-21 Link Here
15
		liblz4.so:archivers/liblz4 \
15
		liblz4.so:archivers/liblz4 \
16
		libsz.so:science/szip
16
		libsz.so:science/szip
17
17
18
USES=		cmake localbase:ldflags pkgconfig
18
USES=		cmake compiler:c++11-lang localbase:ldflags pkgconfig
19
USE_GITHUB=	yes
19
USE_GITHUB=	yes
20
GH_ACCOUNT=	mariusmuja
20
GH_ACCOUNT=	mariusmuja
21
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
(-)files/patch-src_cpp_CMakeLists.txt (-7 / +1 lines)
Lines 1-6 Link Here
1
--- src/cpp/CMakeLists.txt.orig	2019-04-07 03:21:23 UTC
1
--- src/cpp/CMakeLists.txt.orig	2019-04-07 03:21:23 UTC
2
+++ src/cpp/CMakeLists.txt
2
+++ src/cpp/CMakeLists.txt
3
@@ -25,11 +25,11 @@ if (BUILD_CUDA_LIB)
3
@@ -25,6 +25,6 @@ if (BUILD_CUDA_LIB)
4
     else()
4
     else()
5
 	    set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" )
5
 	    set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" )
6
     endif()
6
     endif()
Lines 8-16 Link Here
8
+    cuda_add_library(flann_cuda_s SHARED ${CU_SOURCES})
8
+    cuda_add_library(flann_cuda_s SHARED ${CU_SOURCES})
9
     set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
9
     set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
10
 endif()
10
 endif()
11
 
12
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
13
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|DragonFly" AND CMAKE_COMPILER_IS_GNUCC)
14
     add_library(flann_cpp SHARED "")
15
     set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
16
     target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)

Return to bug 249152