From e6c2d5b28014de7748131b879e0ff56d4277b258 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 14 Nov 2008 18:48:27 +0000
Subject: -add a very simple test for FindXine.cmake, more will follow They
 have to be executed manually for now.

Alex



svn path=/trunk/KDE/kdelibs/; revision=884359
---
 modules-tests/Xine/CMakeLists.txt | 12 ++++++++++++
 modules-tests/readme.txt          |  6 ++++++
 2 files changed, 18 insertions(+)
 create mode 100644 modules-tests/Xine/CMakeLists.txt
 create mode 100644 modules-tests/readme.txt

(limited to 'modules-tests')

diff --git a/modules-tests/Xine/CMakeLists.txt b/modules-tests/Xine/CMakeLists.txt
new file mode 100644
index 00000000..4fcbbd58
--- /dev/null
+++ b/modules-tests/Xine/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.6.2)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+find_package(Xine)
+
+message(STATUS "XINE_FOUND: \"${XINE_FOUND}\"")
+message(STATUS "XINE_VERSION: \"${XINE_VERSION}\"")
+message(STATUS "XINE_BUGFIX_VERSION: \"${XINE_BUGFIX_VERSION}\"")
+message(STATUS "XINE_INCLUDE_DIR: \"${XINE_INCLUDE_DIR}\"")
+message(STATUS "XINE_LIBRARY: \"${XINE_LIBRARY}\"")
+message(STATUS "XINE_XCB_FOUND: \"${XINE_XCB_FOUND}\"")
+
diff --git a/modules-tests/readme.txt b/modules-tests/readme.txt
new file mode 100644
index 00000000..2fabc9bf
--- /dev/null
+++ b/modules-tests/readme.txt
@@ -0,0 +1,6 @@
+in each of the subdirs here is a simple CMakeLists.txt which does a very
+basic test for one of the cmake modules in the modules/ directory.
+To run them, create a build directory, run cmake and check the output.
+(yes, this can of course be enhanced, but it's better than nothing).
+
+Alex
-- 
cgit v1.2.1


From 5dee5a83bd51420f74a5723583b9c194077397bd Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 14 Nov 2008 19:02:54 +0000
Subject: -mark variables as advanced and add simple test

Alex



svn path=/trunk/KDE/kdelibs/; revision=884365
---
 modules-tests/Flex/CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 modules-tests/Flex/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/Flex/CMakeLists.txt b/modules-tests/Flex/CMakeLists.txt
new file mode 100644
index 00000000..0cc21104
--- /dev/null
+++ b/modules-tests/Flex/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.6.2)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+find_package(Flex)
+
+message(STATUS "FLEX_FOUND: \"${FLEX_FOUND}\"")
+message(STATUS "FLEX_VERSION: \"${FLEX_VERSION}\"")
+message(STATUS "FLEX_EXECUTABLE: \"${FLEX_EXECUTABLE}\"")
+
-- 
cgit v1.2.1


From de54277a5fca412232a166928233861106c99f7a Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 14 Nov 2008 20:45:30 +0000
Subject: -add a test for FindQCA2.cmake -add a macro
 test_find_package(<package> <prefix>
 <var_without_prefix1>...<var_without_prefixN>) for executing a mdoule and
 printing the results -add cmake script RunAllModuleTests.cmake which can be
 used to run all existing tests in one go

Alex



svn path=/trunk/KDE/kdelibs/; revision=884395
---
 modules-tests/Flex/CMakeLists.txt     |  8 ++------
 modules-tests/QCA2/CMakeLists.txt     |  5 +++++
 modules-tests/RunAllModuleTests.cmake | 20 ++++++++++++++++++++
 modules-tests/TestFindPackage.cmake   | 35 +++++++++++++++++++++++++++++++++++
 modules-tests/Xine/CMakeLists.txt     | 11 ++---------
 5 files changed, 64 insertions(+), 15 deletions(-)
 create mode 100644 modules-tests/QCA2/CMakeLists.txt
 create mode 100644 modules-tests/RunAllModuleTests.cmake
 create mode 100644 modules-tests/TestFindPackage.cmake

(limited to 'modules-tests')

diff --git a/modules-tests/Flex/CMakeLists.txt b/modules-tests/Flex/CMakeLists.txt
index 0cc21104..38b66566 100644
--- a/modules-tests/Flex/CMakeLists.txt
+++ b/modules-tests/Flex/CMakeLists.txt
@@ -1,9 +1,5 @@
-cmake_minimum_required(VERSION 2.6.2)
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
-find_package(Flex)
-
-message(STATUS "FLEX_FOUND: \"${FLEX_FOUND}\"")
-message(STATUS "FLEX_VERSION: \"${FLEX_VERSION}\"")
-message(STATUS "FLEX_EXECUTABLE: \"${FLEX_EXECUTABLE}\"")
 
+test_find_package(Flex FLEX VERSION EXECUTABLE)
diff --git a/modules-tests/QCA2/CMakeLists.txt b/modules-tests/QCA2/CMakeLists.txt
new file mode 100644
index 00000000..46f617ed
--- /dev/null
+++ b/modules-tests/QCA2/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(QCA2  QCA2  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
new file mode 100644
index 00000000..537072c1
--- /dev/null
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -0,0 +1,20 @@
+# run this script via "cmake -P RunAllModuletests.cmake" to
+# execute all module tests in one go.
+# To see only the results and not the other cmake output,
+# you can grep for ">>".
+
+get_filename_component(currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+function(execute_one_test name)
+   set(workingDir "${currentDir}/${name}/build")
+   file(REMOVE_RECURSE "${workingDir}")
+   file(MAKE_DIRECTORY "${workingDir}")
+   execute_process(COMMAND ${CMAKE_COMMAND} "${currentDir}/${name}"
+                   WORKING_DIRECTORY "${workingDir}")
+endfunction(execute_one_test)
+
+execute_one_test(Xine)
+execute_one_test(Flex)
+execute_one_test(QCA2)
+
+
diff --git a/modules-tests/TestFindPackage.cmake b/modules-tests/TestFindPackage.cmake
new file mode 100644
index 00000000..1a1bf8fe
--- /dev/null
+++ b/modules-tests/TestFindPackage.cmake
@@ -0,0 +1,35 @@
+# This module provides the macro TEST_FIND_PACKAGE()
+#
+# TEST_FIND_PACKAGE(package prefix var1 .. varN )
+#    It can be used to test a CMake Find-module.
+#    It executes FIND_PACKAGE(<package>) and then prints some results.
+#    <package> is the same as for FIND_PACKAGE() and
+#    prefix should be the prefix which is used in that module for
+#    all variables.
+#    It checks <prefix>_FOUND to decide whether the module was successful or not.
+#
+# Example:
+#   test_find_package(Xine  XINE  VERSION INCLUDE_DIR LIBRARY)
+#
+# This will check XINE_FOUND and then print the variables XINE_VERSION, XINE_INCLUDE_DIR and XINE_LIBRARY.
+
+cmake_minimum_required(VERSION 2.6.2)
+cmake_policy(SET CMP0000 OLD)
+
+macro(TEST_FIND_PACKAGE package prefix )
+   message(STATUS ">> ***** Testing Find${package}.cmake *****")
+   find_package(${package})
+   message(STATUS ">> ***** Results from Find${package}.cmake *****")
+
+   if ( ${prefix}_FOUND)
+      message(STATUS ">> Find${package}.cmake: ${package} has been found")
+   else ( ${prefix}_FOUND)
+      message(STATUS ">> Find${package}.cmake: ${package} has NOT been found !")
+   endif ( ${prefix}_FOUND)
+
+   message(STATUS "${prefix}_FOUND: \"${${prefix}_FOUND}\"")
+   foreach(var ${ARGN})
+      message(STATUS ">> ${prefix}_${var}: \"${${prefix}_${var}}\"")
+   endforeach(var)
+   message(STATUS ">> ***** Done *****")
+endmacro(TEST_FIND_PACKAGE package)
diff --git a/modules-tests/Xine/CMakeLists.txt b/modules-tests/Xine/CMakeLists.txt
index 4fcbbd58..8c2ac6e6 100644
--- a/modules-tests/Xine/CMakeLists.txt
+++ b/modules-tests/Xine/CMakeLists.txt
@@ -1,12 +1,5 @@
-cmake_minimum_required(VERSION 2.6.2)
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
-find_package(Xine)
-
-message(STATUS "XINE_FOUND: \"${XINE_FOUND}\"")
-message(STATUS "XINE_VERSION: \"${XINE_VERSION}\"")
-message(STATUS "XINE_BUGFIX_VERSION: \"${XINE_BUGFIX_VERSION}\"")
-message(STATUS "XINE_INCLUDE_DIR: \"${XINE_INCLUDE_DIR}\"")
-message(STATUS "XINE_LIBRARY: \"${XINE_LIBRARY}\"")
-message(STATUS "XINE_XCB_FOUND: \"${XINE_XCB_FOUND}\"")
 
+test_find_package(Xine  XINE  VERSION BUGFIX_VERSION INCLUDE_DIR LIBRARY XCB_FOUND)
-- 
cgit v1.2.1


From f56b4fe57bccfb3bc5611bf75c8fb54c02bcd48c Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 14 Nov 2008 20:55:01 +0000
Subject: -add a test for FindBlitz.cmake -change output prefix from ">>" to
 "::" (doesn't have to be quoted when grepping) -add option CLEAN_DIRS to
 RunAllModuleTests.cmake, if you set this to TRUE, the previous test build
 directories will be removed before running the tests

Alex


svn path=/trunk/KDE/kdelibs/; revision=884400
---
 modules-tests/Blitz/CMakeLists.txt    |  5 +++++
 modules-tests/RunAllModuleTests.cmake |  8 ++++++--
 modules-tests/TestFindPackage.cmake   | 14 +++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 modules-tests/Blitz/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/Blitz/CMakeLists.txt b/modules-tests/Blitz/CMakeLists.txt
new file mode 100644
index 00000000..ef81e4df
--- /dev/null
+++ b/modules-tests/Blitz/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(Blitz  BLITZ  INCLUDES LIBRARIES)
diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index 537072c1..3e529a96 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -1,13 +1,16 @@
 # run this script via "cmake -P RunAllModuletests.cmake" to
 # execute all module tests in one go.
 # To see only the results and not the other cmake output,
-# you can grep for ">>".
+# you can grep for "::".
+# To have it delete the previous test build dirs, run it with -DCLEAN_DIRS=TRUE
 
 get_filename_component(currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
 function(execute_one_test name)
    set(workingDir "${currentDir}/${name}/build")
-   file(REMOVE_RECURSE "${workingDir}")
+   if(CLEAN_DIRS)
+      file(REMOVE_RECURSE "${workingDir}")
+   endif(CLEAN_DIRS)
    file(MAKE_DIRECTORY "${workingDir}")
    execute_process(COMMAND ${CMAKE_COMMAND} "${currentDir}/${name}"
                    WORKING_DIRECTORY "${workingDir}")
@@ -16,5 +19,6 @@ endfunction(execute_one_test)
 execute_one_test(Xine)
 execute_one_test(Flex)
 execute_one_test(QCA2)
+execute_one_test(Blitz)
 
 
diff --git a/modules-tests/TestFindPackage.cmake b/modules-tests/TestFindPackage.cmake
index 1a1bf8fe..d176938f 100644
--- a/modules-tests/TestFindPackage.cmake
+++ b/modules-tests/TestFindPackage.cmake
@@ -17,19 +17,19 @@ cmake_minimum_required(VERSION 2.6.2)
 cmake_policy(SET CMP0000 OLD)
 
 macro(TEST_FIND_PACKAGE package prefix )
-   message(STATUS ">> ***** Testing Find${package}.cmake *****")
+   message(STATUS ":: ***** Testing Find${package}.cmake *****")
    find_package(${package})
-   message(STATUS ">> ***** Results from Find${package}.cmake *****")
+   message(STATUS ":: ***** Results from Find${package}.cmake *****")
 
    if ( ${prefix}_FOUND)
-      message(STATUS ">> Find${package}.cmake: ${package} has been found")
+      message(STATUS ":: Find${package}.cmake: ${package} has been found")
    else ( ${prefix}_FOUND)
-      message(STATUS ">> Find${package}.cmake: ${package} has NOT been found !")
+      message(STATUS ":: Find${package}.cmake: ${package} has NOT been found !")
    endif ( ${prefix}_FOUND)
 
-   message(STATUS "${prefix}_FOUND: \"${${prefix}_FOUND}\"")
+   message(STATUS ":: ${prefix}_FOUND: \"${${prefix}_FOUND}\"")
    foreach(var ${ARGN})
-      message(STATUS ">> ${prefix}_${var}: \"${${prefix}_${var}}\"")
+      message(STATUS ":: ${prefix}_${var}: \"${${prefix}_${var}}\"")
    endforeach(var)
-   message(STATUS ">> ***** Done *****")
+   message(STATUS ":: ***** Done *****")
 endmacro(TEST_FIND_PACKAGE package)
-- 
cgit v1.2.1


From b46c76acad12c8d752dc51a56eec295229e1eb43 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 14 Nov 2008 21:42:16 +0000
Subject: add test for Eigen2

Alex


svn path=/trunk/KDE/kdelibs/; revision=884414
---
 modules-tests/Eigen2/CMakeLists.txt   | 5 +++++
 modules-tests/RunAllModuleTests.cmake | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 modules-tests/Eigen2/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/Eigen2/CMakeLists.txt b/modules-tests/Eigen2/CMakeLists.txt
new file mode 100644
index 00000000..b2ae0d35
--- /dev/null
+++ b/modules-tests/Eigen2/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(Eigen2  EIGEN2  INCLUDE_DIR )
diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index 3e529a96..dbff28e8 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -16,9 +16,8 @@ function(execute_one_test name)
                    WORKING_DIRECTORY "${workingDir}")
 endfunction(execute_one_test)
 
-execute_one_test(Xine)
+execute_one_test(Blitz)
+execute_one_test(Eigen2)
 execute_one_test(Flex)
 execute_one_test(QCA2)
-execute_one_test(Blitz)
-
-
+execute_one_test(Xine)
-- 
cgit v1.2.1


From 2134a85e5587f386f75934ec936f640fd5384216 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 14 Nov 2008 21:45:54 +0000
Subject: add test for FLAC

Alex


svn path=/trunk/KDE/kdelibs/; revision=884417
---
 modules-tests/Flac/CMakeLists.txt     | 5 +++++
 modules-tests/RunAllModuleTests.cmake | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 modules-tests/Flac/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/Flac/CMakeLists.txt b/modules-tests/Flac/CMakeLists.txt
new file mode 100644
index 00000000..604f2dd6
--- /dev/null
+++ b/modules-tests/Flac/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(Flac  FLAC  INCLUDE_DIR LIBRARIES OGGFLAC_LIBRARIES)
diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index dbff28e8..9b58959c 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -19,5 +19,6 @@ endfunction(execute_one_test)
 execute_one_test(Blitz)
 execute_one_test(Eigen2)
 execute_one_test(Flex)
+execute_one_test(Flac)
 execute_one_test(QCA2)
 execute_one_test(Xine)
-- 
cgit v1.2.1


From 1e0f7b9bfdf023838b0157ca11fdb65d476e7818 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 16 Nov 2008 16:47:43 +0000
Subject: test the modules one with and once without pkg-config

Alex



svn path=/trunk/KDE/kdelibs/; revision=885115
---
 modules-tests/RunAllModuleTests.cmake |  8 ++++++++
 modules-tests/TestFindPackage.cmake   | 13 +++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'modules-tests')

diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index 9b58959c..31198c50 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -14,6 +14,14 @@ function(execute_one_test name)
    file(MAKE_DIRECTORY "${workingDir}")
    execute_process(COMMAND ${CMAKE_COMMAND} "${currentDir}/${name}"
                    WORKING_DIRECTORY "${workingDir}")
+   # now the same with pkg-config disabled
+   set(workingDir "${currentDir}/${name}/build-no-pkgconfig")
+   if(CLEAN_DIRS)
+      file(REMOVE_RECURSE "${workingDir}")
+   endif(CLEAN_DIRS)
+   file(MAKE_DIRECTORY "${workingDir}")
+   execute_process(COMMAND ${CMAKE_COMMAND} -DPKG_CONFIG_EXECUTABLE=echo "${currentDir}/${name}"
+                   WORKING_DIRECTORY "${workingDir}")
 endfunction(execute_one_test)
 
 execute_one_test(Blitz)
diff --git a/modules-tests/TestFindPackage.cmake b/modules-tests/TestFindPackage.cmake
index d176938f..8de22b06 100644
--- a/modules-tests/TestFindPackage.cmake
+++ b/modules-tests/TestFindPackage.cmake
@@ -17,7 +17,16 @@ cmake_minimum_required(VERSION 2.6.2)
 cmake_policy(SET CMP0000 OLD)
 
 macro(TEST_FIND_PACKAGE package prefix )
-   message(STATUS ":: ***** Testing Find${package}.cmake *****")
+   # if PKG_CONFIG_EXECUTABLE is set to "echo", FindPkgConfig.cmake
+   # will not search again for the real pkg-config, as it would if it was set to NOTFOUND
+   # and still the execute_process(${PKG_CONFIG_EXECUTABLE} ) calls will work
+   # but never return success.
+   if("${PKG_CONFIG_EXECUTABLE}" STREQUAL "echo")
+      message(STATUS ":: ***** Testing Find${package}.cmake, with pkg-config disabled *****")
+   else("${PKG_CONFIG_EXECUTABLE}" STREQUAL "echo")
+      message(STATUS ":: ***** Testing Find${package}.cmake *****")
+   endif("${PKG_CONFIG_EXECUTABLE}" STREQUAL "echo")
+
    find_package(${package})
    message(STATUS ":: ***** Results from Find${package}.cmake *****")
 
@@ -31,5 +40,5 @@ macro(TEST_FIND_PACKAGE package prefix )
    foreach(var ${ARGN})
       message(STATUS ":: ${prefix}_${var}: \"${${prefix}_${var}}\"")
    endforeach(var)
-   message(STATUS ":: ***** Done *****")
+   message(STATUS "::")
 endmacro(TEST_FIND_PACKAGE package)
-- 
cgit v1.2.1


From 61ecb1d7e50e0ccc0c1f062a9d90f5763b9ea0fb Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 16 Nov 2008 18:55:35 +0000
Subject: add a test for strigi 0.6.0

Alex


svn path=/trunk/KDE/kdelibs/; revision=885198
---
 modules-tests/RunAllModuleTests.cmake |  1 +
 modules-tests/Strigi/CMakeLists.txt   | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 modules-tests/Strigi/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index 31198c50..c388423a 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -29,4 +29,5 @@ execute_one_test(Eigen2)
 execute_one_test(Flex)
 execute_one_test(Flac)
 execute_one_test(QCA2)
+execute_one_test(Strigi)
 execute_one_test(Xine)
diff --git a/modules-tests/Strigi/CMakeLists.txt b/modules-tests/Strigi/CMakeLists.txt
new file mode 100644
index 00000000..e9d624f4
--- /dev/null
+++ b/modules-tests/Strigi/CMakeLists.txt
@@ -0,0 +1,14 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+set(STRIGI_MIN_VERSION 0.6.0)
+test_find_package(Strigi  STRIGI  VERSION 
+                                  INCLUDE_DIR 
+                                  STREAMANALYZER_LIBRARY
+                                  STREAMS_LIBRARY 
+                                  STRIGIQTDBUSCLIENT_LIBRARY 
+                                  NEEDS_SIGNED_CHAR 
+                                  NEEDS_CHAR
+                                  LINE_ANALYZER_PREFIX 
+                                  THROUGH_ANALYZER_PREFIX )
-- 
cgit v1.2.1


From 2272394b6ef05df4c4e8996b09aba0d411f249fc Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Tue, 2 Dec 2008 21:36:37 +0000
Subject: -add simple tests for more Find-modules -add support -DMODULE=<name>
 to test only one module (both with and without pkgconfig)

Alex



svn path=/trunk/KDE/kdelibs/; revision=891797
---
 modules-tests/AGG/CMakeLists.txt         |  5 +++++
 modules-tests/BlueZ/CMakeLists.txt       |  5 +++++
 modules-tests/GObject/CMakeLists.txt     |  5 +++++
 modules-tests/GStreamer/CMakeLists.txt   |  5 +++++
 modules-tests/LCMS/CMakeLists.txt        |  5 +++++
 modules-tests/LibArt/CMakeLists.txt      |  5 +++++
 modules-tests/LibXslt/CMakeLists.txt     |  5 +++++
 modules-tests/OpenEXR/CMakeLists.txt     |  5 +++++
 modules-tests/PCRE/CMakeLists.txt        |  5 +++++
 modules-tests/QImageBlitz/CMakeLists.txt |  5 +++++
 modules-tests/RunAllModuleTests.cmake    | 36 +++++++++++++++++++++++++-------
 modules-tests/Sqlite/CMakeLists.txt      |  5 +++++
 modules-tests/Strigi/CMakeLists.txt      |  3 +++
 modules-tests/USB/CMakeLists.txt         |  5 +++++
 modules-tests/Xmms/CMakeLists.txt        |  5 +++++
 15 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 modules-tests/AGG/CMakeLists.txt
 create mode 100644 modules-tests/BlueZ/CMakeLists.txt
 create mode 100644 modules-tests/GObject/CMakeLists.txt
 create mode 100644 modules-tests/GStreamer/CMakeLists.txt
 create mode 100644 modules-tests/LCMS/CMakeLists.txt
 create mode 100644 modules-tests/LibArt/CMakeLists.txt
 create mode 100644 modules-tests/LibXslt/CMakeLists.txt
 create mode 100644 modules-tests/OpenEXR/CMakeLists.txt
 create mode 100644 modules-tests/PCRE/CMakeLists.txt
 create mode 100644 modules-tests/QImageBlitz/CMakeLists.txt
 create mode 100644 modules-tests/Sqlite/CMakeLists.txt
 create mode 100644 modules-tests/USB/CMakeLists.txt
 create mode 100644 modules-tests/Xmms/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/AGG/CMakeLists.txt b/modules-tests/AGG/CMakeLists.txt
new file mode 100644
index 00000000..3d0e7b90
--- /dev/null
+++ b/modules-tests/AGG/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(AGG  AGG  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/BlueZ/CMakeLists.txt b/modules-tests/BlueZ/CMakeLists.txt
new file mode 100644
index 00000000..bfc17709
--- /dev/null
+++ b/modules-tests/BlueZ/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(BlueZ  BLUEZ  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/GObject/CMakeLists.txt b/modules-tests/GObject/CMakeLists.txt
new file mode 100644
index 00000000..971a20be
--- /dev/null
+++ b/modules-tests/GObject/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(GObject  GOBJECT  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/GStreamer/CMakeLists.txt b/modules-tests/GStreamer/CMakeLists.txt
new file mode 100644
index 00000000..896a8536
--- /dev/null
+++ b/modules-tests/GStreamer/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(GStreamer  GSTREAMER  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/LCMS/CMakeLists.txt b/modules-tests/LCMS/CMakeLists.txt
new file mode 100644
index 00000000..43a90425
--- /dev/null
+++ b/modules-tests/LCMS/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(LCMS  LCMS  INCLUDE_DIR LIBRARIES VERSION)
diff --git a/modules-tests/LibArt/CMakeLists.txt b/modules-tests/LibArt/CMakeLists.txt
new file mode 100644
index 00000000..e64d2310
--- /dev/null
+++ b/modules-tests/LibArt/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(LibArt  LIBART  INCLUDE_DIR LIBRARIES)
diff --git a/modules-tests/LibXslt/CMakeLists.txt b/modules-tests/LibXslt/CMakeLists.txt
new file mode 100644
index 00000000..561a6930
--- /dev/null
+++ b/modules-tests/LibXslt/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(LibXslt  LIBXSLT  INCLUDE_DIR LIBRARIES DEFINITIONS XSLTPROC_EXECUTABLE)
diff --git a/modules-tests/OpenEXR/CMakeLists.txt b/modules-tests/OpenEXR/CMakeLists.txt
new file mode 100644
index 00000000..dd33dab9
--- /dev/null
+++ b/modules-tests/OpenEXR/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(OpenEXR  OPENEXR  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/PCRE/CMakeLists.txt b/modules-tests/PCRE/CMakeLists.txt
new file mode 100644
index 00000000..928806da
--- /dev/null
+++ b/modules-tests/PCRE/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(PCRE  PCRE  INCLUDE_DIR LIBRARIES)
diff --git a/modules-tests/QImageBlitz/CMakeLists.txt b/modules-tests/QImageBlitz/CMakeLists.txt
new file mode 100644
index 00000000..12edb3f7
--- /dev/null
+++ b/modules-tests/QImageBlitz/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(QImageBlitz  QIMAGEBLITZ  INCLUDES LIBRARIES)
diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index c388423a..e523227b 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -24,10 +24,32 @@ function(execute_one_test name)
                    WORKING_DIRECTORY "${workingDir}")
 endfunction(execute_one_test)
 
-execute_one_test(Blitz)
-execute_one_test(Eigen2)
-execute_one_test(Flex)
-execute_one_test(Flac)
-execute_one_test(QCA2)
-execute_one_test(Strigi)
-execute_one_test(Xine)
+if(DEFINED MODULE)
+   set(modulesToTest ${MODULE})
+else(DEFINED MODULE)
+   set(modulesToTest AGG 
+                     Blitz 
+                     BlueZ
+                     Eigen2 
+                     Flac 
+                     Flex 
+                     GObject 
+                     GStreamer
+                     LCMS 
+                     LibArt 
+                     LibXslt 
+                     OpenEXR 
+                     PCRE 
+                     QCA2 
+                     QImageBlitz
+                     Sqlite 
+                     Strigi 
+                     USB 
+                     Xine 
+                     Xmms)
+endif(DEFINED MODULE)
+
+foreach(currentModule ${modulesToTest})
+   execute_one_test(${currentModule})
+endforeach(currentModule ${modulesToTest})
+
diff --git a/modules-tests/Sqlite/CMakeLists.txt b/modules-tests/Sqlite/CMakeLists.txt
new file mode 100644
index 00000000..000be428
--- /dev/null
+++ b/modules-tests/Sqlite/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(Sqlite  SQLITE  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/Strigi/CMakeLists.txt b/modules-tests/Strigi/CMakeLists.txt
index e9d624f4..bbe1e23f 100644
--- a/modules-tests/Strigi/CMakeLists.txt
+++ b/modules-tests/Strigi/CMakeLists.txt
@@ -3,6 +3,9 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
 
 set(STRIGI_MIN_VERSION 0.6.0)
+
+#find_package(Strigi 1.2.3)
+
 test_find_package(Strigi  STRIGI  VERSION 
                                   INCLUDE_DIR 
                                   STREAMANALYZER_LIBRARY
diff --git a/modules-tests/USB/CMakeLists.txt b/modules-tests/USB/CMakeLists.txt
new file mode 100644
index 00000000..37f9dd2c
--- /dev/null
+++ b/modules-tests/USB/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(USB  LIBUSB  INCLUDE_DIR LIBRARIES)
diff --git a/modules-tests/Xmms/CMakeLists.txt b/modules-tests/Xmms/CMakeLists.txt
new file mode 100644
index 00000000..c55e6a44
--- /dev/null
+++ b/modules-tests/Xmms/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(Xmms  XMMS  INCLUDE_DIR LIBRARIES )
-- 
cgit v1.2.1


From 3d781e4e0c12d4cf1296403d176c416a09f47852 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Mon, 22 Dec 2008 08:34:00 +0000
Subject: -test FindFFmpeg.cmake

Alex



svn path=/trunk/KDE/kdelibs/; revision=900097
---
 modules-tests/FFmpeg/CMakeLists.txt   | 5 +++++
 modules-tests/RunAllModuleTests.cmake | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 modules-tests/FFmpeg/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/FFmpeg/CMakeLists.txt b/modules-tests/FFmpeg/CMakeLists.txt
new file mode 100644
index 00000000..4c93079b
--- /dev/null
+++ b/modules-tests/FFmpeg/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(FFmpeg  FFMPEG  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index e523227b..d04385bf 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -1,5 +1,7 @@
-# run this script via "cmake -P RunAllModuletests.cmake" to
+# Run this script via "cmake -P RunAllModuletests.cmake" to
 # execute all module tests in one go.
+# Run this script with "cmake -DMODULE=foo -P RunAllModuletests.cmake" to 
+# test only the one specified module.
 # To see only the results and not the other cmake output,
 # you can grep for "::".
 # To have it delete the previous test build dirs, run it with -DCLEAN_DIRS=TRUE
@@ -31,6 +33,7 @@ else(DEFINED MODULE)
                      Blitz 
                      BlueZ
                      Eigen2 
+                     FFmpeg
                      Flac 
                      Flex 
                      GObject 
-- 
cgit v1.2.1


From 81e042e87254db5293e1a1e3891f9529d0373b4d Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Tue, 23 Dec 2008 09:40:41 +0000
Subject: -add simple test for FindENCHANT.cmake

Alex



svn path=/trunk/KDE/kdelibs/; revision=900551
---
 modules-tests/ENCHANT/CMakeLists.txt  | 5 +++++
 modules-tests/RunAllModuleTests.cmake | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 modules-tests/ENCHANT/CMakeLists.txt

(limited to 'modules-tests')

diff --git a/modules-tests/ENCHANT/CMakeLists.txt b/modules-tests/ENCHANT/CMakeLists.txt
new file mode 100644
index 00000000..6ed9e51f
--- /dev/null
+++ b/modules-tests/ENCHANT/CMakeLists.txt
@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../TestFindPackage.cmake")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../modules" )
+
+test_find_package(ENCHANT  ENCHANT  INCLUDE_DIR LIBRARIES DEFINITIONS)
diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake
index d04385bf..d68f61fd 100644
--- a/modules-tests/RunAllModuleTests.cmake
+++ b/modules-tests/RunAllModuleTests.cmake
@@ -32,6 +32,7 @@ else(DEFINED MODULE)
    set(modulesToTest AGG 
                      Blitz 
                      BlueZ
+                     ENCHANT
                      Eigen2 
                      FFmpeg
                      Flac 
-- 
cgit v1.2.1