* [gentoo-commits] gentoo-x86 commit in media-libs/libechonest/files: libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch
@ 2014-04-06 19:06 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2014-04-06 19:06 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/04/06 19:06:00
Added: libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch
Log:
Grab upstream patch for always using QJSON_LIBRARIES wrt #503656#c4 by "Uwe L. Korn"
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.1 media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch?rev=1.1&content-type=text/plain
Index: libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch
===================================================================
http://bugs.gentoo.org/show_bug.cgi?id=503656#c4
http://github.com/lfranchi/libechonest/pull/14
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -40,16 +40,8 @@
QT_WRAP_CPP( ${LIBECHONEST_H} )
-SET( OS_SPECIFIC_LINK_LIBRARIES "" )
-IF( APPLE OR MINGW )
- SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LIBRARIES} )
-ELSE( APPLE OR MINGW )
- SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LDFLAGS} )
-ENDIF( APPLE OR MINGW )
-
-
add_library( echonest SHARED ${LIBECHONEST_SRC} )
-target_link_libraries( echonest ${OS_SPECIFIC_LINK_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
+target_link_libraries( echonest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES} )
set_target_properties( echonest PROPERTIES VERSION ${ECHONEST_LIB_VERSION} SOVERSION ${ECHONEST_LIB_VERSION_SONAME} )
qt5_use_modules( echonest Core Network Xml )
install( TARGETS echonest RUNTIME DESTINATION bin
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-04-06 19:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-06 19:06 [gentoo-commits] gentoo-x86 commit in media-libs/libechonest/files: libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox