~ubuntu-branches/ubuntu/wily/openms/wily

« back to all changes in this revision

Viewing changes to debian/patches/force-use-shared-object-libs-upon-linking.patch

  • Committer: Package Import Robot
  • Author(s): Filippo Rusconi
  • Date: 2012-11-12 15:58:12 UTC
  • Revision ID: package-import@ubuntu.com-20121112155812-e6mvctvil4ko9npv
Tags: 1.9.0-1
1.9.0 First Debian package release (Closes: #691129).

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Force linking against share object libraries, not static ones.--- a/cmake/OpenMSBuildSystem_externalLibs.cmake
 
2
+++ b/cmake/OpenMSBuildSystem_externalLibs.cmake
 
3
@@ -48,12 +48,18 @@
 
4
 ##             compiler-wise: use the same compiler for contrib and OpenMS!
 
5
 
 
6
 #set which library extensions are preferred (we want static libraries)
 
7
-if(NOT MSVC)
 
8
-       set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
 
9
-endif()
 
10
-if (APPLE)
 
11
-       set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.dylib")
 
12
-endif()
 
13
+# if(NOT MSVC)
 
14
+#      set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
 
15
+# endif()
 
16
+# if (APPLE)
 
17
+#      set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.dylib")
 
18
+# endif()
 
19
+# 
 
20
+
 
21
+# We want to FORCE *.so to be used, not *.a.
 
22
+
 
23
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
 
24
+
 
25
 
 
26
 OPENMS_CHECKLIB(CONTRIB_XERCESC "xerces-c_3;xerces-c_static_3;libxerces-c;xerces-c" "xerces-c_3D;xerces-c_static_3D;libxerces-c;xerces-c" "xerces_c")
 
27