extragear/multimedia/amarok

Ian Monroe ian.monroe at gmail.com
Sat Mar 7 06:37:42 UTC 2009


SVN commit 936142 by ianmonroe:

If cmake detects that the script generator is already installed, it does not
build it. If the script generator isn't installed it works like before. As with
all build system changes, some testing would be appreciated.

At some point in the next couple of weeks Amarok will refuse to build
without the QtScript Generator already installed. You can download the
binding generator seperately at http://code.google.com/p/qtscriptgenerator/downloads/list
This is what Amarok 2.1 will be doing. Users having trouble building the generator
with cmake can use this now.

177863 is closed for sure. :>

CCMAIL: amarok at kde.org
BUG: 177863

 M  +7 -1      CMakeLists.txt  
 A             cmake/modules/CheckQtScriptBindings.cmake  
 A             cmake/modules/QtScriptBindingsTest.cpp   [License: Public Domain LGPL (v2.1+)]


--- trunk/extragear/multimedia/amarok/CMakeLists.txt #936141:936142
@@ -20,7 +20,13 @@
 
 #this line has to be before add_defintions, but after the KDE4 cmake includes
 #because they are used to determine install locations
-add_subdirectory( src/scriptengine/generator )
+include(CheckQtScriptBindings)
+if( NOT QTSCRIPT_QT_BINDINGS_FOUND )
+#we're keeping the script generator in our code to give some
+#time to transition to depending on it seperate
+    add_subdirectory( src/scriptengine/generator )
+endif( QTSCRIPT_QT_BINDINGS_FOUND )
+
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 include(CheckLibraryExists)



More information about the Amarok mailing list