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

List:       kde-core-devel
Subject:    [Patch] Fix kde3 Makefile.am porting with am2cmake
From:       Nadeem Hasan <nhasan () nadmm ! com>
Date:       2006-07-16 2:27:43
Message-ID: 200607152227.48758.nhasan () nadmm ! com
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


Hi all,

Last week I decided to port the build system for something I am working on to 
cmake. I tried am2cmake to do my job using --kde3 (It's stil KDE3 based) and 
it failed miserably. After wasting a lot of time, and learning a few things 
about cmake, it turned out to be a small bug in am2cmake that this patch 
fixes. Ok to commit?

Regards.
-- 
Nadeem Hasan (nhasan-at-nadmm.com)
GPG Fingerprint: 7141 0B1C 9CAF 624D 307F F8EF 6C0C 753E DD3A 0F53

["am2cmake.diff" (text/x-diff)]

Index: am2cmake
===================================================================
--- am2cmake	(revision 562626)
+++ am2cmake	(working copy)
@@ -532,7 +532,7 @@
    def createKDE3ListsFile
 
       file=File.new(@listsFile, "w+");
-      if @amFile=="Makefile.am" && $no_kde==false         # the toplevel Makefile.am
+      if @amFile=="Makefile.am" && $buildType != BuildNoKDE   # the toplevel Makefile.am
           file.printf("FIND_PACKAGE(KDE3 REQUIRED)\n\n")
           file.printf("SET(CMAKE_VERBOSE_MAKEFILE ON)\n\n")
           file.printf("ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE3_DEFINITIONS})\n\n")
@@ -667,7 +667,7 @@
             file.printf("INSTALL_TARGETS(/bin %s )\n", buildTarget.name)
 
          else  #executable
-            if $no_kde
+            if $buildType == BuildNoKDE
 
                file.printf("ADD_EXECUTABLE(%s ${%s})\n\n", buildTarget.name, srcsName)
 

[Attachment #6 (application/pgp-signature)]

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