[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Ian Monroe <ian.monroe () gmail ! com>
Date:       2008-08-21 19:48:57
Message-ID: 1219348137.835540.12593.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850583 by ianmonroe:

ok, this doesn't actually get the script bindings to install.
but it should.
~amarok2


 M  +6 -3      CMakeLists.txt  


--- trunk/extragear/multimedia/amarok/CMakeLists.txt #850582:850583
@@ -2,9 +2,7 @@
 
 cmake_minimum_required(VERSION 2.4.5)
 
-if (NOT WIN32 )
-add_subdirectory( src/scriptengine/generator )
-endif (NOT WIN32)
+
 #We depend on kde4.1 now.. I believe this is the easiest way to do it.
 set(KDE_MIN_VERSION "4.1.0")
 find_package( KDE4 REQUIRED )
@@ -20,6 +18,11 @@
 set( CMAKE_MODULE_PATH    ${CMAKE_MODULE_PATH}
                           ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
 
+if (NOT WIN32 )
+    #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 )
+endif (NOT WIN32)
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include(CheckLibraryExists)
 check_library_exists(dl dlopen "" LIBDL_FOUND)
[prev in list] [next in list] [prev in thread] [next in thread]