[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:29 UTC 2011


The following commit has been merged in the debian branch:
commit 2469c170d889e44198097f0e323ed67936284c61
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Thu Mar 10 18:50:28 2011 +0100

    Restored the original version of the src/CMakeLists.txt file.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7360fad..2d7d69a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,18 +58,10 @@ 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(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()
+if(C2B_USE_LZO)
+  target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES})
 else()
-  if(C2B_USE_LZO)
-    target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES})
-  else()
-    target_link_libraries(cb2bib c2b ${QT_LIBRARIES})
-  endif()
+  target_link_libraries(cb2bib c2b ${QT_LIBRARIES})
 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