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