mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
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.
This commit is contained in:
parent
5d0bbb55f6
commit
3ed7731b71
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=389749
@ -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})
|
||||
|
Loading…
Reference in New Issue
Block a user