From owner-svn-ports-all@FreeBSD.ORG Sun May 3 19:36:02 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EECD8B0F; Sun, 3 May 2015 19:36:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD8D510E4; Sun, 3 May 2015 19:36:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t43Ja2Ja068141; Sun, 3 May 2015 19:36:02 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43Ja2rd068140; Sun, 3 May 2015 19:36:02 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201505031936.t43Ja2rd068140@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 3 May 2015 19:36:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385307 - head/devel/cmake/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 May 2015 19:36:03 -0000 Author: rakuco Date: Sun May 3 19:36:02 2015 New Revision: 385307 URL: https://svnweb.freebsd.org/changeset/ports/385307 Log: Set LIBLZMA_INCLUDE_DIR and LIBLZMA_LIBRARY in the initial cache. Do it so that we can hardcode these variables to point to base's liblzma, otherwise the liblzma.so installed by archivers/lzmalib will be chosen if present and the configuration process will fail. This is done only so that `make configure' works, as liblzma is only used if we build CMake's bundled libarchive. MFH: 2015Q2 Modified: head/devel/cmake/files/InitialCache.cmake Modified: head/devel/cmake/files/InitialCache.cmake ============================================================================== --- head/devel/cmake/files/InitialCache.cmake Sun May 3 19:35:59 2015 (r385306) +++ head/devel/cmake/files/InitialCache.cmake Sun May 3 19:36:02 2015 (r385307) @@ -4,3 +4,13 @@ # devel/qt4-corelib is not). # See https://mail.kde.org/pipermail/kde-freebsd/2013-July/015703.html set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") + +# Force CMake to look for base's liblzma, otherwise the configuration process +# will fail if archivers/lzmalib is installed, as CMake will try to use its +# liblzma.so. +# Note that this is necessary only for `make configure' to work, as liblzma is +# only ever used if CMake's bundled libarchive is being used. +set(LIBLZMA_INCLUDE_DIR "/usr/include" CACHE PATH + "Directory where LibLZMA headers are located.") +set(LIBLZMA_LIBRARY "/usr/lib/liblzma.so" CACHE PATH + "LibLZMA library to link against..")