Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/lightspark/files: lightspark-0.4.4-cmakelists.patch lightspark-0.4.3-cmakelists.patch
Date: Sun, 29 Aug 2010 20:11:50
Message-Id: 20100829201142.E39C720054@flycatcher.gentoo.org
1 chithanh 10/08/29 20:11:42
2
3 Added: lightspark-0.4.4-cmakelists.patch
4 Removed: lightspark-0.4.3-cmakelists.patch
5 Log:
6 Version bump.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch?rev=1.1&content-type=text/plain
14
15 Index: lightspark-0.4.4-cmakelists.patch
16 ===================================================================
17 diff -ur a/CMakeLists.txt b/CMakeLists.txt
18 --- a/CMakeLists.txt 2010-08-29 16:50:40.000000000 +0200
19 +++ b/CMakeLists.txt 2010-08-29 22:01:32.000000000 +0200
20 @@ -303,7 +303,7 @@
21 ADD_LIBRARY(spark STATIC ${LIBSPARK_SOURCES})
22 ENDIF (CMAKE_COMPILER_IS_GNUCC)
23
24 -TARGET_LINK_LIBRARIES(spark ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRECPP_LIBRARIES} ${Threads_LIBRARIES})
25 +TARGET_LINK_LIBRARIES(spark ${CMAKE_MODULE_LINKER_FLAGS} ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRECPP_LIBRARIES} ${Threads_LIBRARIES})
26 SET_TARGET_PROPERTIES(spark PROPERTIES VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
27 SET_TARGET_PROPERTIES(spark PROPERTIES SOVERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
28
29 @@ -315,7 +315,7 @@
30 IF(COMPILE_LIGHTSPARK)
31 ADD_EXECUTABLE(lightspark main.cpp)
32 TARGET_LINK_LIBRARIES(lightspark spark)
33 - TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY})
34 + TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${CMAKE_MODULE_LINKER_FLAGS})
35
36 IF(UNIX)
37 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)
38 @@ -328,7 +328,7 @@
39 # tightspark executable target
40 IF(COMPILE_TIGHTSPARK)
41 ADD_EXECUTABLE(tightspark tightspark.cpp)
42 - TARGET_LINK_LIBRARIES(tightspark spark)
43 + TARGET_LINK_LIBRARIES(tightspark spark ${CMAKE_MODULE_LINKER_FLAGS})
44
45 IF(UNIX)
46 INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})