[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Don't install flann static lib, fix so...

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d93340c8d65e
changeset: 4858:d93340c8d65e
user:      Bruno Postle <br...@po...>
date:       Tue Jan 18 21:53:58 2011 +0000
description:
Don't install flann static lib, fix soname

diffstat:

 src/foreign/flann/CMakeLists.txt |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r 9cf4ed265424 -r d93340c8d65e src/foreign/flann/CMakeLists.txt
--- a/src/foreign/flann/CMakeLists.txt	Tue Jan 18 17:31:35 2011 +0100
+++ b/src/foreign/flann/CMakeLists.txt	Tue Jan 18 21:53:58 2011 +0000
@@ -18,15 +18,12 @@
 
     add_library(flann_cpp SHARED "")
     target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
-    set_target_properties(flann_cpp PROPERTIES
-       VERSION ${FLANN_VERSION}
-       SOVERSION ${FLANN_SOVERSION}
-    ) 
+    set_target_properties(flann_cpp PROPERTIES VERSION ${HUGIN_LIB_VERSION}) 
 
     IF(${HUGIN_LIBS_PRIVATE_DIR})
-        install(TARGETS flann_cpp flann_cpp_s LIBRARY DESTINATION ${LIBDIR}/hugin NAMELINK_SKIP ARCHIVE DESTINATION ${LIBDIR}/hugin  )
+        install(TARGETS flann_cpp LIBRARY DESTINATION ${LIBDIR}/hugin NAMELINK_SKIP ARCHIVE DESTINATION ${LIBDIR}/hugin  )
     ELSE()
-        install(TARGETS flann_cpp flann_cpp_s LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP ARCHIVE DESTINATION ${LIBDIR} )
+        install(TARGETS flann_cpp LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP ARCHIVE DESTINATION ${LIBDIR} )
     ENDIF()
 ELSE()
     add_library(flann_cpp SHARED ${CPP_SOURCES})