7 files changed, 7 insertions, 252 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 97d0f6d3..7a555ea0 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -19,17 +19,17 @@ set(FILES_TO_REMOVE
  ${module_install_dir}/UsePkgconfig.cmake
  ${module_install_dir}/kde3uic.cmake
  ${module_install_dir}/kde3init_dummy.cpp.in
+ ${module_install_dir}/FindASPELL.cmake
+ ${module_install_dir}/FindLibXml2.cmake
+ ${module_install_dir}/FindHSPELL.cmake
+ ${module_install_dir}/FindJasper.cmake
+ ${module_install_dir}/CheckCXXCompilerFlag.cmake
+ ${module_install_dir}/FindBZip2.cmake
 )
 
-# can be removed once we require cmake 2.4.4 or newer:
-# CheckCXXCompilerFlag.cmake
-# FindBZip2.cmake
-# FindJasper.cmake
-# FindLibXml2.cmake
+# can be removed once we require merge into cmake
 # FindLibXslt.cmake
 # FindOpenSSL.cmake
-# FindASPELL.cmake
-# FindHSPELL.cmake
 
 # can be removed once we require cmake 2.4.6 or newer:
 # FindPkgConfig.cmake
diff --git a/modules/CheckCXXCompilerFlag.cmake b/modules/CheckCXXCompilerFlag.cmake
deleted file mode 100644
index 43ea9a64..00000000
--- a/modules/CheckCXXCompilerFlag.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# - Check whether the CXX compiler supports a given flag.
-# CHECK_CXX_COMPILER_FLAG(FLAG VARIABLE)
-#
-#  FLAG - the compiler flag
-#  VARIABLE - variable to store the result
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-INCLUDE(CheckCXXSourceCompiles)
-
-MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
-   SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
-   SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
-   CHECK_CXX_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT})
-   SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
-ENDMACRO (CHECK_CXX_COMPILER_FLAG)
-
diff --git a/modules/FindASPELL.cmake b/modules/FindASPELL.cmake
deleted file mode 100644
index 978407d6..00000000
--- a/modules/FindASPELL.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# - Try to find ASPELL
-# Once done this will define
-#
-#  ASPELL_FOUND - system has ASPELL
-#  ASPELL_INCLUDE_DIR - the ASPELL include directory
-#  ASPELL_LIBRARIES - The libraries needed to use ASPELL
-#  ASPELL_DEFINITIONS - Compiler switches required for using ASPELL
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
-  # Already in cache, be silent
-  SET(ASPELL_FIND_QUIETLY TRUE)
-ENDIF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
-
-FIND_PATH(ASPELL_INCLUDE_DIR aspell.h )
-
-FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15)
-
-IF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
-   SET(ASPELL_FOUND TRUE)
-ELSE (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
-   SET(ASPELL_FOUND FALSE)
-ENDIF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
-
-IF (ASPELL_FOUND)
-  IF (NOT ASPELL_FIND_QUIETLY)
-    MESSAGE(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}")
-  ENDIF (NOT ASPELL_FIND_QUIETLY)
-ELSE (ASPELL_FOUND)
-  IF (ASPELL_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could NOT find ASPELL")
-  ENDIF (ASPELL_FIND_REQUIRED)
-ENDIF (ASPELL_FOUND)
-
-MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES)
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
deleted file mode 100644
index c8464249..00000000
--- a/modules/FindBZip2.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# - Try to find BZip2
-# Once done this will define
-#
-#  BZIP2_FOUND - system has BZip2
-#  BZIP2_INCLUDE_DIR - the BZip2 include directory
-#  BZIP2_LIBRARIES - Link these to use BZip2
-#  BZIP2_DEFINITIONS - Compiler switches required for using BZip2
-#  BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-    SET(BZip2_FIND_QUIETLY TRUE)
-ENDIF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-
-FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
-
-FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 )
-
-IF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-   SET(BZIP2_FOUND TRUE)
-   INCLUDE(CheckLibraryExists)
-   CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
-ELSE (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-   SET(BZIP2_FOUND FALSE)
-ENDIF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-
-IF (BZIP2_FOUND)
-  IF (NOT BZip2_FIND_QUIETLY)
-    MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
-  ENDIF (NOT BZip2_FIND_QUIETLY)
-ELSE (BZIP2_FOUND)
-  IF (BZip2_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could NOT find BZip2")
-  ENDIF (BZip2_FIND_REQUIRED)
-ENDIF (BZIP2_FOUND)
-
-MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
-
diff --git a/modules/FindHSPELL.cmake b/modules/FindHSPELL.cmake
deleted file mode 100644
index a2b93a77..00000000
--- a/modules/FindHSPELL.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# - Try to find HSPELL
-# Once done this will define
-#
-#  HSPELL_FOUND - system has HSPELL
-#  HSPELL_INCLUDE_DIR - the HSPELL include directory
-#  HSPELL_LIBRARIES - The libraries needed to use HSPELL
-#  HSPELL_DEFINITIONS - Compiler switches required for using HSPELL
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
-  # Already in cache, be silent
-  SET(HSPELL_FIND_QUIETLY TRUE)
-ENDIF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
-
-
-FIND_PATH(HSPELL_INCLUDE_DIR hspell.h )
-
-FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell )
-
-IF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
-   SET(HSPELL_FOUND TRUE)
-ELSE (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
-   SET(HSPELL_FOUND FALSE)
-ENDIF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
-
-IF (HSPELL_FOUND)
-  IF (NOT HSPELL_FIND_QUIETLY)
-    MESSAGE(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}")
-  ENDIF (NOT HSPELL_FIND_QUIETLY)
-ELSE (HSPELL_FOUND)
-  IF (HSPELL_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could NOT find HSPELL")
-  ENDIF (HSPELL_FIND_REQUIRED)
-ENDIF (HSPELL_FOUND)
-
-MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES)
-
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
deleted file mode 100644
index ac284c37..00000000
--- a/modules/FindJasper.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# - Try to find the Jasper JPEG2000 library
-# Once done this will define
-#
-#  JASPER_FOUND - system has Jasper
-#  JASPER_INCLUDE_DIR - the Jasper include directory
-#  JASPER_LIBRARIES - The libraries needed to use Jasper
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-FIND_PACKAGE(JPEG)
-
-IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
-  # Already in cache, be silent
-  SET(Jasper_FIND_QUIETLY TRUE)
-ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
-
-FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
-
-FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
-
-IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES)
-   SET(JASPER_FOUND TRUE)
-   SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
-ELSE (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES)
-   SET(JASPER_FOUND FALSE)
-ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES)
-
-
-IF (JASPER_FOUND)
-   IF (NOT Jasper_FIND_QUIETLY)
-      MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARIES}")
-   ENDIF (NOT Jasper_FIND_QUIETLY)
-ELSE (JASPER_FOUND)
-   IF (Jasper_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could NOT find jasper library")
-   ENDIF (Jasper_FIND_REQUIRED)
-ENDIF (JASPER_FOUND)
-
-MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES JASPER_LIBRARY)
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
deleted file mode 100644
index 47136df0..00000000
--- a/modules/FindLibXml2.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# - Try to find LibXml2
-# Once done this will define
-#
-#  LIBXML2_FOUND - system has LibXml2
-#  LIBXML2_INCLUDE_DIR - the LibXml2 include directory
-#  LIBXML2_LIBRARIES - the libraries needed to use LibXml2
-#  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   # in cache already
-   SET(LibXml2_FIND_QUIETLY TRUE)
-ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-
-IF (NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   INCLUDE(UsePkgConfig)
-   PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
-   SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
-ENDIF (NOT WIN32)
-
-FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
-   PATHS
-   ${_LibXml2IncDir}
-   PATH_SUFFIXES libxml2
-   )
-
-FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
-   PATHS
-   ${_LibXml2LinkDir}
-   )
-
-IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   SET(LIBXML2_FOUND TRUE)
-ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   SET(LIBXML2_FOUND FALSE)
-ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-
-IF (LIBXML2_FOUND)
-   IF (NOT LibXml2_FIND_QUIETLY)
-      MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
-   ENDIF (NOT LibXml2_FIND_QUIETLY)
-ELSE (LIBXML2_FOUND)
-   IF (LibXml2_FIND_REQUIRED)
-      MESSAGE(SEND_ERROR "Could NOT find LibXml2")
-   ENDIF (LibXml2_FIND_REQUIRED)
-ENDIF (LIBXML2_FOUND)
-
-MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
-