[gentoo-commits] gentoo-x86 commit in games-action/openastromenace/files: openastromenace-1.2.0-cmake.patch

[Tristan Heaven (nyhm)]

nyhm        08/06/03 14:19:33

  Added:                openastromenace-1.2.0-cmake.patch
  Log:
  Fix build error with cmake-2.6
  (Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25.4 Intel(R) Core(TM)2 Duo CPU E6750 @ 2.66GHz)

Revision  Changes    Path
1.1                  games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch?rev=1.1&content-type=text/plain

Index: openastromenace-1.2.0-cmake.patch
===================================================================
--- CMakeLists.txt	2008/02/15 09:55:15	33
+++ CMakeLists.txt	2008/05/19 08:11:36	36
@@ -13,6 +13,8 @@
 # ./AstroMenace
 #
 
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
 # project name
 PROJECT(AstroMenace)
 
@@ -43,9 +45,12 @@
  IF(DEFINED DATADIR)
 	ADD_DEFINITIONS(-DDATADIR=\\"${DATADIR}\\")
  ENDIF(DEFINED DATADIR)
- ADD_DEFINITIONS(`${SDL_CONFIG} --cflags` -Wall)
+ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS)
+ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--libs" OUTPUT_VARIABLE SDL_LIBS)
+
+ ADD_DEFINITIONS(${SDL_CFLAGS})
  ADD_EXECUTABLE(AstroMenace ${astromenace_SRCS})
- TARGET_LINK_LIBRARIES(AstroMenace `${SDL_CONFIG} --libs` ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
+ TARGET_LINK_LIBRARIES(AstroMenace ${SDL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
  IF(CYGWIN)
 	TARGET_LINK_LIBRARIES(AstroMenace -lGL.dll  -lGLU.dll -lglfw -lX11.dll)
 #	ADD_DEFINITIONS(-mno-cygwin)



-- 
gentoo-commits@l.g.o mailing list