-simple cmake modules for detecting libart, OpenSSL, FAM, jasper and PCRE

-major improvement of am2cmake: add libtool .la files found in LIBADD to TARGET_LINK_LIBRARIES and fix the loop for adding the libs

Alex


svn path=/trunk/KDE/kdesdk/cmake/; revision=498154

1 files changed, 7 insertions, 5 deletions

diff --git a/am2cmake b/am2cmake
index 80ab2bf7..61724c44 100755
--- a/am2cmake
+++ b/am2cmake
@@ -84,16 +84,18 @@ class BuildTarget
          else
             if currentLib =~ /^-l(\S+)$/
                $1
+            elsif currentLib =~ /^.+\/lib(\w+)\.la$/
+               $1   
             else
                ""
             end
          end
-      end
 
-      if !lib.empty?
-         @libs.push(lib)
-#         printf("--- lib: #{lib}\n")
+         if !lib.empty?
+            @libs.push(lib)
+         end
       end
+
    end
 
 
@@ -363,7 +365,7 @@ class CMakeFile
                return
             end
 
-#            printf("target: #{buildTarget.name} lib: #{$2} line: #{line} d1: #{$1}\n")
+#            $stderr.printf("target: #{buildTarget.name} lib: #{$2} line: #{line} d1: #{$1}\n")
             buildTarget.addLibs($2)
          end
          return