svn commit: r385307 - head/devel/cmake/files

Raphael Kubo da Costa rakuco at FreeBSD.org
Sun May 3 19:36:03 UTC 2015


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..")


More information about the svn-ports-all mailing list