OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

37 lines
1.6 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../clucene/fix_zlib_detections.patch
  5. # Copyright (C) 2013 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. From: Veit Jahns <idolum@users.sourceforge.net>
  17. Date: Thu, 26 May 2011 11:35:28 +0000 (+0200)
  18. Subject: Fixing ZLIB configuration in shared's CMakeLists
  19. X-Git-Url: http://clucene.git.sourceforge.net/git/gitweb.cgi?p=clucene%2Fclucene;a=commitdiff_plain;h=772481ca94071ddfe65102a451926e4f9aeb4d2c;hp=a834f87bad3543b2a0331cef7202c15ded4245be
  20. Fixing ZLIB configuration in shared's CMakeLists
  21. ---
  22. diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
  23. index 68314a7..3d1975e 100644
  24. --- a/src/shared/CMakeLists.txt
  25. +++ b/src/shared/CMakeLists.txt
  26. @@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions)
  27. find_package(ZLIB)
  28. IF ( ZLIB_FOUND )
  29. SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} )
  30. -ELSEIF ( ZLIB_FOUND )
  31. +ELSE ( ZLIB_FOUND )
  32. MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" )
  33. SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib )
  34. SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR})