From 59a7bc4694a93aae668f2d68409a420a12e8d9fb Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Sun, 3 Feb 2013 20:42:11 +0100
Subject: Modifications to allow crosscompiling with mingw

Reviewed-by: bjorn.
---
 CMake/Modules/FindSigC++.cmake    | 14 +++++++-------
 CMake/Modules/LibFindMacros.cmake |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'CMake')

diff --git a/CMake/Modules/FindSigC++.cmake b/CMake/Modules/FindSigC++.cmake
index 35687d5..45796e5 100644
--- a/CMake/Modules/FindSigC++.cmake
+++ b/CMake/Modules/FindSigC++.cmake
@@ -8,27 +8,27 @@
 include(LibFindMacros)
 
 # Use pkg-config to get hints about paths
-libfind_pkg_check_modules(SigC++_PKGCONF sigc++-2.0)
+libfind_pkg_check_modules(SIGC++_PKGCONF sigc++-2.0)
 
 # Main include dir
-find_path(SigC++_INCLUDE_DIR
+find_path(SIGC++_INCLUDE_DIR
   NAMES sigc++/sigc++.h
   PATHS ${SigC++_PKGCONF_INCLUDE_DIRS}
   PATH_SUFFIXES sigc++-2.0
 )
 
 # Glib-related libraries also use a separate config header, which is in lib dir
-find_path(SigC++Config_INCLUDE_DIR
+find_path(SIGC++Config_INCLUDE_DIR
   NAMES sigc++config.h
   PATHS ${SigC++_PKGCONF_INCLUDE_DIRS} /usr
   PATH_SUFFIXES lib/sigc++-2.0/include
 )
 
-libfind_library(SigC++ sigc 2.0)
+libfind_library(SIGC++ sigc 2.0)
 
 # 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(SigC++_PROCESS_INCLUDES SigC++_INCLUDE_DIR SigC++Config_INCLUDE_DIR)
-set(SigC++_PROCESS_LIBS SigC++_LIBRARY)
-libfind_process(SigC++)
+set(SIGC++_PROCESS_INCLUDES SIGC++_INCLUDE_DIR SIGC++Config_INCLUDE_DIR)
+set(SIGC++_PROCESS_LIBS SIGC++_LIBRARIES)
+libfind_process(SIGC++)
diff --git a/CMake/Modules/LibFindMacros.cmake b/CMake/Modules/LibFindMacros.cmake
index 69975c5..bb38792 100644
--- a/CMake/Modules/LibFindMacros.cmake
+++ b/CMake/Modules/LibFindMacros.cmake
@@ -91,7 +91,7 @@ macro(libfind_library PREFIX basename)
     string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
     set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
   endif(${ARGC} GREATER 2)
-  find_library(${PREFIX}_LIBRARY
+  find_library(${PREFIX}_LIBRARIES
     NAMES ${${PREFIX}_LIBNAMES}
     PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
   )
-- 
cgit