Date: Mon, 15 Jun 2015 21:49:52 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389757 - head/science/avogadro/files Message-ID: <201506152149.t5FLnqvw094291@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Jun 15 21:49:52 2015 New Revision: 389757 URL: https://svnweb.freebsd.org/changeset/ports/389757 Log: Add patch to fix the build with CMake 3.2. Explicitly look for X11, since FindOpenGL.cmake no longer does that automatically. Added: head/science/avogadro/files/patch-CMakeLists.txt (contents, props changed) Added: head/science/avogadro/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/avogadro/files/patch-CMakeLists.txt Mon Jun 15 21:49:52 2015 (r389757) @@ -0,0 +1,22 @@ +Explicitly look for X11 when using it. + +This fixes the build with CMake 3.2, whose FindOpenGL.cmake stopped +calling find_package(X11). + +Instead, do that ourselves when Q_WS_X11 is true, since that is when we +already try to link against libX11. + +Sent upstream: https://github.com/cryos/avogadro/pull/13 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -230,6 +230,10 @@ if(NOT Linguist_FOUND) + message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") + endif() + ++if(Q_WS_X11) ++ find_package(X11 REQUIRED) # avogadro/src/main.cpp calls XInitThread(). ++endif() ++ + find_package(Eigen3) # find and setup Eigen3 if available + if(NOT EIGEN3_FOUND) + message(STATUS "Cannot find Eigen3, trying Eigen2")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506152149.t5FLnqvw094291>