Date: Mon, 15 Jun 2015 20:19:55 +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: r389749 - head/games/memonix/files Message-ID: <201506152019.t5FKJtEb048302@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Jun 15 20:19:54 2015 New Revision: 389749 URL: https://svnweb.freebsd.org/changeset/ports/389749 Log: Refresh CMakeLists.txt patch to directly look for X11. In preparation for the upcoming CMake 3.2 update, in which FindOpenGL.cmake does not look for X11 on its own anymore. Modified: head/games/memonix/files/patch-CMakeLists.txt Modified: head/games/memonix/files/patch-CMakeLists.txt ============================================================================== --- head/games/memonix/files/patch-CMakeLists.txt Mon Jun 15 20:02:04 2015 (r389748) +++ head/games/memonix/files/patch-CMakeLists.txt Mon Jun 15 20:19:54 2015 (r389749) @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2007-07-13 00:18:26.000000000 +0400 -+++ CMakeLists.txt 2008-05-19 03:20:57.000000000 +0400 +--- CMakeLists.txt.orig 2007-07-12 20:18:26 UTC ++++ CMakeLists.txt @@ -12,6 +12,8 @@ # into current directory and run ./Memonix # @@ -9,8 +9,11 @@ # project name PROJECT(Memonix) -@@ -31,9 +33,12 @@ +@@ -29,11 +31,15 @@ FIND_PACKAGE(GLU REQUIRED) + FIND_PACKAGE(SDL REQUIRED) + FIND_PACKAGE(SDL_image REQUIRED) FIND_PACKAGE(SDL_mixer REQUIRED) ++FIND_PACKAGE(X11 REQUIRED) # sources -FILE(GLOB_RECURSE memonix_SRCS *.cpp) @@ -24,4 +27,4 @@ +ADD_DEFINITIONS(${SDL_CFLAGS}) ADD_EXECUTABLE(Memonix ${memonix_SRCS}) -TARGET_LINK_LIBRARIES(Memonix `${SDL_CONFIG} --libs` ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_gl_LIBRARY} ${GLU_LIBRARY}) -+TARGET_LINK_LIBRARIES(Memonix ${SDL_LIBS} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_gl_LIBRARY} ${GLU_LIBRARY}) ++TARGET_LINK_LIBRARIES(Memonix ${SDL_LIBS} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_gl_LIBRARY} ${GLU_LIBRARY} ${X11_LIBRARIES})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506152019.t5FKJtEb048302>