Commit 1e5dbee8 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[graphics/flann] Fix build with cmake-3.11

Amend patch-aa fixing the CMakeList : creating a library with no source seem to
not be supported anymore. But this is in practice not needed, this was only
done for the "linux" target, while other target were building libraries
normally. I really don't get the reason to handle linux differently.

Bump PKGREVISION.
parent 7f552087
......@@ -2,6 +2,7 @@
# Created: Nizar Sallem on Tue, 28 Dec 2010
#
PKGREVISION= 1
VERSION= 1.7.1
DISTNAME= flann-${VERSION}-src
PKGNAME= flann-${VERSION}
......
SHA1 (flann-1.7.1-src.zip) = 61b9858620528919ea60a2a4b085ccc2b3c2d138
RMD160 (flann-1.7.1-src.zip) = cec1ce99d2c91ddf8f20d5aa8009a08c5347b904
Size (flann-1.7.1-src.zip) = 582517 bytes
SHA1 (patch-aa) = cb8d071c7091be6df6cfc3a0608978a4b5a38816
SHA1 (patch-aa) = 0cdfe162437ca1d536d2ab138420cefee5fc4df3
SHA1 (patch-ab) = d5e8047b5a01a7617839a3f5f88233b0c9d25764
SHA1 (patch-ac) = 254fdc27725319eb87a05b25cccf236ede40843c
SHA1 (patch-ad) = 77efb736ac941a2471b82f691764f88bac7efa2f
Fix strange constructs: add_library works on linux, no need to handle it
specially
--- src/cpp/CMakeLists.txt 2012-07-18 17:37:07.660607502 +0200
+++ src/cpp/CMakeLists.txt.orig 2011-12-23 12:16:09.000000000 +0100
@@ -24,23 +24,10 @@
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}
@@ -60,12 +60,12 @@
#debug libraries
add_library(flann_cpp-gd SHARED ${CPP_SOURCES})
......@@ -15,3 +42,17 @@
set_property(TARGET flann_cpp_s-gd PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
@@ -108,13 +108,7 @@
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}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment