-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

8 files changed, 165 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
diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake
new file mode 100644
index 00000000..1ac64251
--- /dev/null
+++ b/modules/FindFAM.cmake
@@ -0,0 +1,27 @@
+
+FIND_PATH(FAM_INCLUDE_DIR fam.h
+/usr/include
+/usr/local/include
+)
+
+FIND_LIBRARY(FAM_LIBRARY NAMES fam
+PATHS
+/usr/lib
+/usr/local/lib
+)
+
+
+IF(FAM_INCLUDE_DIR)
+   SET(FAM_FOUND TRUE)
+ENDIF(FAM_INCLUDE_DIR)
+
+
+IF(FAM_FOUND)
+   IF(NOT FAM_FIND_QUIETLY)
+      MESSAGE(STATUS "Found fam: ${FAM_LIBRARY}")
+   ENDIF(NOT FAM_FIND_QUIETLY)
+ELSE(FAM_FOUND)
+   IF(FAM_FIND_REQUIRED)
+      MESSAGE(SEND_ERROR "Could not find fam library")
+   ENDIF(FAM_FIND_REQUIRED)
+ENDIF(FAM_FOUND)
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
new file mode 100644
index 00000000..4123229e
--- /dev/null
+++ b/modules/FindJasper.cmake
@@ -0,0 +1,27 @@
+
+FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h
+/usr/include
+/usr/local/include
+)
+
+FIND_LIBRARY(JASPER_LIBRARY NAMES jasper
+PATHS
+/usr/lib
+/usr/local/lib
+)
+
+
+IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARY)
+   SET(JASPER_FOUND TRUE)
+ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARY)
+
+
+IF(JASPER_FOUND)
+   IF(NOT JASPER_FIND_QUIETLY)
+      MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARY}")
+   ENDIF(NOT JASPER_FIND_QUIETLY)
+ELSE(JASPER_FOUND)
+   IF(JASPER_FIND_REQUIRED)
+      MESSAGE(SEND_ERROR "Could not find jasper library")
+   ENDIF(JASPER_FIND_REQUIRED)
+ENDIF(JASPER_FOUND)
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
new file mode 100644
index 00000000..e170d0e9
--- /dev/null
+++ b/modules/FindLibArt.cmake
@@ -0,0 +1,27 @@
+
+FIND_PATH(LIBART_INCLUDE_DIR libart_lgpl/libart.h
+/usr/include/libart-2.0
+/usr/local/include/libart-2.0
+)
+
+FIND_LIBRARY(LIBART_LIBRARY NAMES art_lgpl_2
+PATHS
+/usr/lib
+/usr/local/lib
+)
+
+
+IF(LIBART_INCLUDE_DIR AND LIBART_LIBRARY)
+   SET(LIBART_FOUND TRUE)
+ENDIF(LIBART_INCLUDE_DIR AND LIBART_LIBRARY)
+
+
+IF(LIBART_FOUND)
+   IF(NOT LIBART_FIND_QUIETLY)
+      MESSAGE(STATUS "Found libart: ${LIBART_LIBRARY}")
+   ENDIF(NOT LIBART_FIND_QUIETLY)
+ELSE(LIBART_FOUND)
+   IF(LIBART_FIND_REQUIRED)
+      MESSAGE(SEND_ERROR "Could not find libart")
+   ENDIF(LIBART_FIND_REQUIRED)
+ENDIF(LIBART_FOUND)
diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake
new file mode 100644
index 00000000..615d9ac7
--- /dev/null
+++ b/modules/FindOpenEXR.cmake
@@ -0,0 +1,12 @@
+
+FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h
+/usr/include
+/usr/local/include
+)
+
+
+
+IF(OPENEXR_INCLUDE_DIR)
+   SET(OPENEXR_FOUND TRUE)
+ENDIF(OPENEXR_INCLUDE_DIR)
+
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
new file mode 100644
index 00000000..8b6d6e5d
--- /dev/null
+++ b/modules/FindOpenSSL.cmake
@@ -0,0 +1,26 @@
+
+FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
+/usr/include/
+/usr/local/include/
+)
+
+FIND_LIBRARY(OPENSSL_LIBRARY NAMES ssl
+PATHS
+/usr/lib
+/usr/local/lib
+)
+
+IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY)
+   SET(OPENSSL_FOUND TRUE)
+ENDIF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY)
+
+
+IF(OPENSSL_FOUND)
+   IF(NOT OPENSSL_FIND_QUIETLY)
+      MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARY}")
+   ENDIF(NOT OPENSSL_FIND_QUIETLY)
+ELSE(OPENSSL_FOUND)
+   IF(OPENSSL_FIND_REQUIRED)
+      MESSAGE(SEND_ERROR "Could not find OpenSSL")
+   ENDIF(OPENSSL_FIND_REQUIRED)
+ENDIF(OPENSSL_FOUND)
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
new file mode 100644
index 00000000..350cced8
--- /dev/null
+++ b/modules/FindPCRE.cmake
@@ -0,0 +1,34 @@
+
+FIND_PATH(PCRE_INCLUDE_DIR pcre.h
+/usr/include/
+/usr/local/include/
+)
+
+FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre
+PATHS
+/usr/lib
+/usr/local/lib
+)
+
+FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix
+PATHS
+/usr/lib
+/usr/local/lib
+)
+
+SET(PCRE_LIBRARY ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
+
+IF(PCRE_INCLUDE_DIR AND PCRE_LIBRARY)
+   SET(PCRE_FOUND TRUE)
+ENDIF(PCRE_INCLUDE_DIR AND PCRE_LIBRARY)
+
+
+IF(PCRE_FOUND)
+   IF(NOT PCRE_FIND_QUIETLY)
+      MESSAGE(STATUS "Found PCRE: ${PCRE_LIBRARY}")
+   ENDIF(NOT PCRE_FIND_QUIETLY)
+ELSE(PCRE_FOUND)
+   IF(PCRE_FIND_REQUIRED)
+      MESSAGE(SEND_ERROR "Could not find PCRE")
+   ENDIF(PCRE_FIND_REQUIRED)
+ENDIF(PCRE_FOUND)
diff --git a/modules/README b/modules/README
new file mode 100644
index 00000000..3dc1eb80
--- /dev/null
+++ b/modules/README
@@ -0,0 +1,5 @@
+these are modules for detecting software packages needed by KDE, but not yet
+part of cmake
+
+Alex <neundorf@kde.org>
+