Remove custom CMake modules, use pkg-config instead

The custom CMake modules don't add any value, just failure potential.
Get rid of the glue and use standard pkg-config instead.

9 files changed, 16 insertions, 460 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd6a478..57320c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,15 +35,22 @@ SET(G_LOG_DOMAIN "C_CREATEREPOLIB")
 
 find_package(BZip2 REQUIRED)
 find_package(CURL REQUIRED)
-find_package(GLIB2 REQUIRED)
-find_package(GTHREAD2 REQUIRED)
-find_package(Libmagic REQUIRED)
 find_package(LibXml2 REQUIRED)
-find_package(LZMA REQUIRED)
 find_package(OpenSSL REQUIRED)
-find_package(Sqlite3 REQUIRED)
 find_package(ZLIB REQUIRED)
 
+pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+pkg_check_modules(GTHREAD2 REQUIRED gthread-2.0)
+pkg_check_modules(LZMA REQUIRED liblzma)
+pkg_check_modules(SQLITE3 REQUIRED sqlite3)
+
+pkg_check_modules(LIBMAGIC libmagic)
+# the pkg-config was only added in F33
+IF (NOT LIBMAGIC_FOUND)
+    find_path(LIBMAGIC_INCLUDE_DIRS NAMES magic.h PATHS ${CMAKE_INCLUDE_PATH})
+    find_library(LIBMAGIC_LIBRARIES NAMES magic PATHS ${CMAKE_LIBRARY_PATH})
+ENDIF()
+
 # Add include dirs
 
 include_directories(${BZIP2_INCLUDE_DIRS})
@@ -53,7 +60,6 @@ include_directories(${LIBXML2_INCLUDE_DIR})
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIR})
 
-
 IF (RPM_PATH)
     SET (RPM_PATH "/home/tmlcoch/git/rpm")
     include_directories("${RPM_PATH}/include/")
@@ -109,9 +115,9 @@ ENDIF (WITH_ZCHUNK)
 
 OPTION (WITH_LIBMODULEMD "Build with libmodulemd support" ON)
 IF (WITH_LIBMODULEMD)
-	find_package(LIBMODULEMD REQUIRED)
-	include_directories(${LIBMODULEMD_INCLUDE_DIRS})
-	SET (CMAKE_C_FLAGS          "${CMAKE_C_FLAGS} -DWITH_LIBMODULEMD")
+    pkg_check_modules(LIBMODULEMD REQUIRED modulemd-2.0)
+    include_directories(${LIBMODULEMD_INCLUDE_DIRS})
+    SET (CMAKE_C_FLAGS          "${CMAKE_C_FLAGS} -DWITH_LIBMODULEMD")
     SET (CMAKE_C_FLAGS_DEBUG    "${CMAKE_C_FLAGS_DEBUG} -DWITH_LIBMODULEMD")
 ENDIF (WITH_LIBMODULEMD)
 
diff --git a/cmake/Modules/FindGLIB2.cmake b/cmake/Modules/FindGLIB2.cmake
deleted file mode 100644
index 2049522..0000000
--- a/cmake/Modules/FindGLIB2.cmake
+++ /dev/null
@@ -1,100 +0,0 @@
-#.rst:
-# FindGLIB2
-# ---------
-#
-# Try to locate the GLib2 library.
-# If found, this will define the following variables:
-#
-# ``GLIB2_FOUND``
-#     True if the GLib2 library is available
-# ``GLIB2_INCLUDE_DIRS``
-#     The GLib2 include directories
-# ``GLIB2_LIBRARIES``
-#     The GLib2 libraries for linking
-# ``GLIB2_INCLUDE_DIR``
-#     Deprecated, use ``GLIB2_INCLUDE_DIRS``
-# ``GLIB2_LIBRARY``
-#     Deprecated, use ``GLIB2_LIBRARIES``
-#
-# If ``GLIB2_FOUND`` is TRUE, it will also define the following
-# imported target:
-#
-# ``GLIB2::GLIB2``
-#     The GLIB2 library
-#
-# Since 5.41.0.
-
-#=============================================================================
-# Copyright (c) 2008 Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-find_package(PkgConfig)
-pkg_check_modules(PC_GLIB2 QUIET glib-2.0)
-
-find_path(GLIB2_INCLUDE_DIRS
-          NAMES glib.h
-          HINTS ${PC_GLIB2_INCLUDEDIR}
-          PATH_SUFFIXES glib-2.0)
-
-find_library(GLIB2_LIBRARIES
-             NAMES glib-2.0
-             HINTS ${PC_GLIB2_LIBDIR}
-)
-
-# search the glibconfig.h include dir under the same root where the library is found
-get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
-
-find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
-          PATH_SUFFIXES glib-2.0/include
-          HINTS ${PC_GLIB2_INCLUDEDIR} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
-
-# not sure if this include dir is optional or required
-# for now it is optional
-if(GLIB2_INTERNAL_INCLUDE_DIR)
-  list(APPEND GLIB2_INCLUDE_DIRS "${GLIB2_INTERNAL_INCLUDE_DIR}")
-endif()
-
-# Deprecated synonyms
-set(GLIB2_INCLUDE_DIR "${GLIB2_INCLUDE_DIRS}")
-set(GLIB2_LIBRARY "${GLIB2_LIBRARIES}")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_INCLUDE_DIRS)
-
-if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2)
-  add_library(GLIB2::GLIB2 UNKNOWN IMPORTED)
-  set_target_properties(GLIB2::GLIB2 PROPERTIES
-                        IMPORTED_LOCATION "${GLIB2_LIBRARIES}"
-			INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}")
-endif()
-
-mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_INCLUDE_DIR
-                 GLIB2_LIBRARIES GLIB2_LIBRARY)
-
-include(FeatureSummary)
-set_package_properties(GLIB2 PROPERTIES
-  URL "https://wiki.gnome.org/Projects/GLib"
-  DESCRIPTION "Event loop and utility library")
diff --git a/cmake/Modules/FindGTHREAD2.cmake b/cmake/Modules/FindGTHREAD2.cmake
deleted file mode 100644
index a79c36f..0000000
--- a/cmake/Modules/FindGTHREAD2.cmake
+++ /dev/null
@@ -1,78 +0,0 @@
-#.rst:
-# FindGTHREAD2
-# ---------
-#
-# Try to locate the GThread2 library.
-# If found, this will define the following variables:
-#
-# ``GTHREAD2_FOUND``
-#     True if the GThread2 library is available
-# ``GTHREAD2_INCLUDE_DIRS``
-#     The GThread2 include directories
-# ``GTHREAD2_LIBRARIES``
-#     The GThread2 libraries for linking
-# ``GTHREAD2_INCLUDE_DIR``
-#     Deprecated, use ``GTHREAD2_INCLUDE_DIRS``
-# ``GTHREAD2_LIBRARY``
-#     Deprecated, use ``GTHREAD2_LIBRARIES``
-#
-# If ``GTHREAD2_FOUND`` is TRUE, it will also define the following
-# imported target:
-#
-# ``GTHREAD2::GTHREAD2``
-#     The GTHREAD2 library
-
-#=============================================================================
-# Copyright (c) 2008 Laurent Montel, <montel@kde.org>
-# Copyright (c) 2020 Dmitry Mikhirev, <dmitry@mikhirev.ru>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-find_package(PkgConfig)
-pkg_check_modules(PC_GTHREAD2 QUIET gthread-2.0)
-
-find_path(GTHREAD2_INCLUDE_DIRS
-          NAMES gthread.h
-          HINTS ${PC_GTHREAD2_INCLUDEDIR}
-          PATH_SUFFIXES glib-2.0 glib-2.0/glib)
-
-find_library(GTHREAD2_LIBRARIES
-             NAMES gthread-2.0
-             HINTS ${PC_GTHREAD2_LIBDIR}
-)
-
-get_filename_component(gthread2LibDir "${GTHREAD2_LIBRARIES}" PATH)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GTHREAD2 DEFAULT_MSG GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS)
-
-if(GTHREAD2_FOUND AND NOT TARGET GTHREAD2::GTHREAD2)
-  add_library(GTHREAD2::GTHREAD2 UNKNOWN IMPORTED)
-  set_target_properties(GTHREAD2::GTHREAD2 PROPERTIES
-                        IMPORTED_LOCATION "${GTHREAD2_LIBRARIES}"
-			INTERFACE_INCLUDE_DIRECTORIES "${GTHREAD2_INCLUDE_DIRS}")
-endif()
-
-mark_as_advanced(GTHREAD2_INCLUDE_DIRS GTHREAD2_LIBRARIES)
diff --git a/cmake/Modules/FindLIBMODULEMD.cmake b/cmake/Modules/FindLIBMODULEMD.cmake
deleted file mode 100644
index f472031..0000000
--- a/cmake/Modules/FindLIBMODULEMD.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# Try to find libmodulemd 2.3+
-#
-#  LIBMODULEMD_FOUND - system has libmodulemd
-#  LIBMODULEMD_INCLUDE_DIRS - the libmodulemd include directory
-#  LIBMODULEMD_LIBRARIES - Link these to use libmodulemd
-#
-#  Copyright (c) 2019 Stephen Gallagher <sgallagh@redhat.com>
-
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-
-IF ( LIBMODULEMD_LIBRARIES AND LIBMODULEMD_INCLUDE_DIRS )
-  # in cache already
-  SET(LIBMODULEMD_FOUND TRUE)
-ELSE ( LIBMODULEMD_LIBRARIES AND LIBMODULEMD_INCLUDE_DIRS )
-
-	INCLUDE(FindPkgConfig)
-
-	IF ( LIBMODULEMD_FIND_REQUIRED )
-		SET ( _pkgconfig_REQUIRED "REQUIRED" )
-	ELSE ( LIBMODULEMD_FIND_REQUIRED )
-		SET ( _pkgconfig_REQUIRED "" )
-	endif ( LIBMODULEMD_FIND_REQUIRED )
-
-	PKG_SEARCH_MODULE ( LIBMODULEMD ${_pkgconfig_REQUIRED} modulemd-2.0>=2.3 )
-
-	IF (LIBMODULEMD_FOUND)
-    IF (NOT LIBMODULEMD_FIND_QUIETLY)
-      MESSAGE (STATUS "Found libmodulemd: ${LIBMODULEMD_LIBRARIES} ${LIBMODULEMD_INCLUDE_DIRS}")
-    ENDIF (NOT LIBMODULEMD_FIND_QUIETLY)
-  ELSE (LIBMODULEMD_FOUND)
-    IF (LIBMODULEMD_FIND_REQUIRED)
-      MESSAGE (SEND_ERROR "Could not find libmodulemd")
-    ENDIF (LIBMODULEMD_FIND_REQUIRED)
-  ENDIF (LIBMODULEMD_FOUND)
-
-  # show the LIBMODULEMD_INCLUDE_DIRS and LIBMODULEMD_LIBRARIES variables only in the advanced view
-  MARK_AS_ADVANCED(LIBMODULEMD_INCLUDE_DIRS LIBMODULEMD_LIBRARIES)
-
-ENDIF ( LIBMODULEMD_LIBRARIES AND LIBMODULEMD_INCLUDE_DIRS )
diff --git a/cmake/Modules/FindLZMA.cmake b/cmake/Modules/FindLZMA.cmake
deleted file mode 100644
index 1d065c4..0000000
--- a/cmake/Modules/FindLZMA.cmake
+++ /dev/null
@@ -1,52 +0,0 @@
-# - Find lzma and lzmadec
-# Find the native LZMA includes and library
-#
-#  LZMA_INCLUDE_DIR    - where to find lzma.h, etc.
-#  LZMA_LIBRARIES      - List of libraries when using liblzma.
-#  LZMA_FOUND          - True if liblzma found.
-#  LZMADEC_INCLUDE_DIR - where to find lzmadec.h, etc.
-#  LZMADEC_LIBRARIES   - List of libraries when using liblzmadec.
-#  LZMADEC_FOUND       - True if liblzmadec found.
-
-IF (LZMA_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(LZMA_FIND_QUIETLY TRUE)
-ENDIF (LZMA_INCLUDE_DIR)
-
-FIND_PATH(LZMA_INCLUDE_DIR lzma.h)
-FIND_LIBRARY(LZMA_LIBRARY NAMES lzma )
-
-# handle the QUIETLY and REQUIRED arguments and set LZMA_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZMA DEFAULT_MSG LZMA_LIBRARY LZMA_INCLUDE_DIR)
-
-IF(LZMA_FOUND)
-  SET( LZMA_LIBRARIES ${LZMA_LIBRARY} )
-ELSE(LZMA_FOUND)
-  SET( LZMA_LIBRARIES )
-
-  IF (LZMADEC_INCLUDE_DIR)
-    # Already in cache, be silent
-    SET(LZMADEC_FIND_QUIETLY TRUE)
-  ENDIF (LZMADEC_INCLUDE_DIR)
-
-  FIND_PATH(LZMADEC_INCLUDE_DIR lzmadec.h)
-  FIND_LIBRARY(LZMADEC_LIBRARY NAMES lzmadec )
-
-  # handle the QUIETLY and REQUIRED arguments and set LZMADEC_FOUND to TRUE if 
-  # all listed variables are TRUE
-  INCLUDE(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZMADEC DEFAULT_MSG LZMADEC_LIBRARY
-    LZMADEC_INCLUDE_DIR)
-
-  IF(LZMADEC_FOUND)
-    SET( LZMADEC_LIBRARIES ${LZMADEC_LIBRARY} )
-  ELSE(LZMADEC_FOUND)
-    SET( LZMADEC_LIBRARIES )
-  ENDIF(LZMADEC_FOUND)
-ENDIF(LZMA_FOUND)
-
-
-MARK_AS_ADVANCED( LZMA_LIBRARY LZMA_INCLUDE_DIR
-  LZMADEC_LIBRARY LZMADEC_INCLUDE_DIR )
diff --git a/cmake/Modules/FindLibmagic.cmake b/cmake/Modules/FindLibmagic.cmake
deleted file mode 100644
index 557d638..0000000
--- a/cmake/Modules/FindLibmagic.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Find libmagic.so (part of the 'file' package)
-# (C) 2009 by Lorenzo Villani. Licensed under LGPL license.
-#
-
-include(LibFindMacros)
-
-
-# Include dir
-find_path(Libmagic_INCLUDE_DIR
-  NAMES magic.h
-  PATHS ${CMAKE_INCLUDE_PATH}
-)
-
-# Finally the library itself
-find_library(Libmagic_LIBRARY
-  NAMES magic
-  PATHS ${CMAKE_LIBRARY_PATH}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(Libmagic_PROCESS_INCLUDES Libmagic_INCLUDE_DIR Libmagic_INCLUDE_DIRS)
-set(Libmagic_PROCESS_LIBS Libmagic_LIBRARY Libmagic_LIBRARIES)
-libfind_process(Libmagic)
diff --git a/cmake/Modules/FindSqlite3.cmake b/cmake/Modules/FindSqlite3.cmake
deleted file mode 100644
index 0eccec2..0000000
--- a/cmake/Modules/FindSqlite3.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# - find Sqlite 3
-# SQLITE3_INCLUDE_DIR - Where to find Sqlite 3 header files (directory)
-# SQLITE3_LIBRARIES - Sqlite 3 libraries
-# SQLITE3_LIBRARY_RELEASE - Where the release library is
-# SQLITE3_LIBRARY_DEBUG - Where the debug library is
-# SQLITE3_FOUND - Set to TRUE if we found everything (library, includes and executable)
-
-# Copyright (c) 2010 Pau Garcia i Quiles, <pgquiles@elpauer.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-# Generated by CModuler, a CMake Module Generator - http://gitorious.org/cmoduler
-
-IF( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY_RELEASE AND SQLITE3_LIBRARY_DEBUG )
-    SET(SQLITE3_FIND_QUIETLY TRUE)
-ENDIF( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY_RELEASE AND SQLITE3_LIBRARY_DEBUG )
-
-FIND_PATH( SQLITE3_INCLUDE_DIR sqlite3.h  )
-
-FIND_LIBRARY(SQLITE3_LIBRARY_RELEASE NAMES sqlite3 )
-
-FIND_LIBRARY(SQLITE3_LIBRARY_DEBUG NAMES sqlite3 sqlite3d  HINTS /usr/lib/debug/usr/lib/ )
-
-IF( SQLITE3_LIBRARY_RELEASE OR SQLITE3_LIBRARY_DEBUG AND SQLITE3_INCLUDE_DIR )
-	SET( SQLITE3_FOUND TRUE )
-ENDIF( SQLITE3_LIBRARY_RELEASE OR SQLITE3_LIBRARY_DEBUG AND SQLITE3_INCLUDE_DIR )
-
-IF( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE )
-	# if the generator supports configuration types then set
-	# optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
-	IF( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-		SET( SQLITE3_LIBRARIES optimized ${SQLITE3_LIBRARY_RELEASE} debug ${SQLITE3_LIBRARY_DEBUG} )
-	ELSE( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-    # if there are no configuration types and CMAKE_BUILD_TYPE has no value
-    # then just use the release libraries
-		SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_RELEASE} )
-	ENDIF( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-ELSEIF( SQLITE3_LIBRARY_RELEASE )
-	SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_RELEASE} )
-ELSE( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE )
-	SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_DEBUG} )
-ENDIF( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE )
-
-IF( SQLITE3_FOUND )
-	IF( NOT SQLITE3_FIND_QUIETLY )
-		MESSAGE( STATUS "Found Sqlite3 header file in ${SQLITE3_INCLUDE_DIR}")
-		MESSAGE( STATUS "Found Sqlite3 libraries: ${SQLITE3_LIBRARIES}")
-	ENDIF( NOT SQLITE3_FIND_QUIETLY )
-ELSE(SQLITE3_FOUND)
-	IF( SQLITE3_FIND_REQUIRED)
-		MESSAGE( FATAL_ERROR "Could not find Sqlite3" )
-	ELSE( SQLITE3_FIND_REQUIRED)
-		MESSAGE( STATUS "Optional package Sqlite3 was not found" )
-	ENDIF( SQLITE3_FIND_REQUIRED)
-ENDIF(SQLITE3_FOUND)
diff --git a/cmake/Modules/LibFindMacros.cmake b/cmake/Modules/LibFindMacros.cmake
deleted file mode 100644
index 795d6b7..0000000
--- a/cmake/Modules/LibFindMacros.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
-# used for the current package. For this to work, the first parameter must be the
-# prefix of the current package, then the prefix of the new package etc, which are
-# passed to find_package.
-macro (libfind_package PREFIX)
-  set (LIBFIND_PACKAGE_ARGS ${ARGN})
-  if (${PREFIX}_FIND_QUIETLY)
-    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
-  endif (${PREFIX}_FIND_QUIETLY)
-  if (${PREFIX}_FIND_REQUIRED)
-    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
-  endif (${PREFIX}_FIND_REQUIRED)
-  find_package(${LIBFIND_PACKAGE_ARGS})
-endmacro (libfind_package)
-
-# Damn CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
-# where they added pkg_check_modules. Consequently I need to support both in my scripts
-# to avoid those deprecated warnings. Here's a helper that does just that.
-# Works identically to pkg_check_modules, except that no checks are needed prior to use.
-macro (libfind_pkg_check_modules PREFIX PKGNAME)
-  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    include(UsePkgConfig)
-    pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
-  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    find_package(PkgConfig)
-    if (PKG_CONFIG_FOUND)
-      pkg_check_modules(${PREFIX} ${PKGNAME})
-    endif (PKG_CONFIG_FOUND)
-  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-endmacro (libfind_pkg_check_modules)
-
-# Do the final processing once the paths have been detected.
-# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
-# all the variables, each of which contain one include directory.
-# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
-# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
-# Also handles errors in case library detection was required, etc.
-macro (libfind_process PREFIX)
-  # Skip processing if already processed during this run
-  if (NOT ${PREFIX}_FOUND)
-    # Start with the assumption that the library was found
-    set (${PREFIX}_FOUND TRUE)
-
-    # Process all includes and set _FOUND to false if any are missing
-    foreach (i ${${PREFIX}_PROCESS_INCLUDES})
-      if (${i})
-        set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
-        mark_as_advanced(${i})
-      else (${i})
-        set (${PREFIX}_FOUND FALSE)
-      endif (${i})
-    endforeach (i)
-
-    # Process all libraries and set _FOUND to false if any are missing
-    foreach (i ${${PREFIX}_PROCESS_LIBS})
-      if (${i})
-        set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
-        mark_as_advanced(${i})
-      else (${i})
-        set (${PREFIX}_FOUND FALSE)
-      endif (${i})
-    endforeach (i)
-
-    # Print message and/or exit on fatal error
-    if (${PREFIX}_FOUND)
-      if (NOT ${PREFIX}_FIND_QUIETLY)
-        message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
-      endif (NOT ${PREFIX}_FIND_QUIETLY)
-    else (${PREFIX}_FOUND)
-      if (${PREFIX}_FIND_REQUIRED)
-        foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
-          message("${i}=${${i}}")
-        endforeach (i)
-        message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
-      endif (${PREFIX}_FIND_REQUIRED)
-    endif (${PREFIX}_FOUND)
-  endif (NOT ${PREFIX}_FOUND)
-endmacro (libfind_process)
-
-macro(libfind_library PREFIX basename)
-  set(TMP "")
-  if(MSVC80)
-    set(TMP -vc80)
-  endif(MSVC80)
-  if(MSVC90)
-    set(TMP -vc90)
-  endif(MSVC90)
-  set(${PREFIX}_LIBNAMES ${basename}${TMP})
-  if(${ARGC} GREATER 2)
-    set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
-    string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
-    set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
-  endif(${ARGC} GREATER 2)
-  find_library(${PREFIX}_LIBRARY
-    NAMES ${${PREFIX}_LIBNAMES}
-    PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
-  )
-endmacro(libfind_library)
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 616c113..c9ed44e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,7 +68,7 @@ ADD_LIBRARY(libcreaterepo_c ${createrepo_c_library_type} ${createrepo_c_SRCS})
 TARGET_LINK_LIBRARIES(libcreaterepo_c ${BZIP2_LIBRARIES})
 TARGET_LINK_LIBRARIES(libcreaterepo_c ${CURL_LIBRARY})
 TARGET_LINK_LIBRARIES(libcreaterepo_c ${GLIB2_LIBRARIES})
-TARGET_LINK_LIBRARIES(libcreaterepo_c ${Libmagic_LIBRARY})
+TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBMAGIC_LIBRARIES})
 TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBMODULEMD_LIBRARIES})
 TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBXML2_LIBRARIES})
 TARGET_LINK_LIBRARIES(libcreaterepo_c ${LZMA_LIBRARIES})