[SCM] Extract bibliographic references from various sources branch, debian, updated. debian/1.4.4-3

Filippo Rusconi (Debian Maintainer) rusconi-debian at laposte.net
Sat Mar 12 14:05:12 UTC 2011


The following commit has been merged in the debian branch:
commit a46679e6c206e007dd4a4f930547adea1056835b
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Wed Mar 9 20:32:12 2011 +0100

    Added -lX11 to linker command line. See bug #554060.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d7d69a..7360fad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,10 +58,18 @@ else()
   add_executable(cb2bib WIN32 ${CB2BIB_CPP} ${CB2BIB_MOC} ${CB2BIB_UIH} ${CB2BIB_RCC} ${MODSINGAPP_CPP} ${MODSINGAPP_MOC})
   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 endif()
-if(C2B_USE_LZO)
-  target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES})
+if(UNIX AND NOT APPLE)
+  if(C2B_USE_LZO)
+    target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES} -lX11)
+  else()
+    target_link_libraries(cb2bib c2b ${QT_LIBRARIES} -lX11)
+  endif()
 else()
-  target_link_libraries(cb2bib c2b ${QT_LIBRARIES})
+  if(C2B_USE_LZO)
+    target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES})
+  else()
+    target_link_libraries(cb2bib c2b ${QT_LIBRARIES})
+  endif()
 endif()
 if(APPLE)
    install(TARGETS cb2bib BUNDLE DESTINATION ${C2B_INSTALL_BIN_DIR})

-- 
Extract bibliographic references from various sources



More information about the debian-science-commits mailing list