Fix FindIconv naming consistency

cmake/Modules/FindIconv.cmake

@@ -1,16 +1,12 @@
 # Once done these will be defined:
 #
-#  LIBICONV_FOUND
-#  LIBICONV_INCLUDE_DIRS
-#  LIBICONV_LIBRARIES
-#
-# For use in OBS: 
-#
-#  ICONV_INCLUDE_DIR
+#  ICONV_FOUND
+#  ICONV_INCLUDE_DIRS
+#  ICONV_LIBRARIES
 #
 
-if(LIBICONV_INCLUDE_DIRS AND LIBICONV_LIBRARIES)
-	set(LIBICONV_FOUND TRUE)
+if(ICONV_INCLUDE_DIRS AND ICONV_LIBRARIES)
+	set(ICONV_FOUND TRUE)
 else()
 	find_package(PkgConfig QUIET)
 	if (PKG_CONFIG_FOUND)
@@ -23,7 +19,7 @@ else()
 		set(_lib_suffix 32)
 	endif()
 
-	set(ICONV_PATH_ARCH IConvPath${_lib_suffix})
+	set(ICONV_PATH_ARCH IconvPath${_lib_suffix})
 
 	find_path(ICONV_INCLUDE_DIR
 		NAMES iconv.h
@@ -31,7 +27,7 @@ else()
 			${_ICONV_INCLUDE_DIRS}
 			"${CMAKE_SOURCE_DIR}/additional_install_files/include"
 			"$ENV{obsAdditionalInstallFiles}/include"
-			ENV IConvPath
+			ENV IconvPath
 			ENV ${ICONV_PATH_ARCH}
 		PATHS
 			/usr/include /usr/local/include /opt/local/include /sw/include)
@@ -40,17 +36,17 @@ else()
 		NAMES ${_ICONV_LIBRARIES} iconv libiconv
 		HINTS
 			${_ICONV_LIBRARY_DIRS}
-			"${ICONV_INCLUDE_DIR}/../lib"
 			"${ICONV_INCLUDE_DIR}/../lib${_lib_suffix}"
+			"${ICONV_INCLUDE_DIR}/../lib"
 			"${ICONV_INCLUDE_DIR}/../libs${_lib_suffix}"
 			"${ICONV_INCLUDE_DIR}/lib"
 			"${ICONV_INCLUDE_DIR}/lib${_lib_suffix}"
 		PATHS
 			/usr/lib /usr/local/lib /opt/local/lib /sw/lib)
 
-	set(LIBICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR} CACHE PATH "iconv include dir")
-	set(LIBICONV_LIBRARIES ${ICONV_LIB} CACHE STRING "iconv libraries")
+	set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR} CACHE PATH "iconv include dir")
+	set(ICONV_LIBRARIES ${ICONV_LIB} CACHE STRING "iconv libraries")
 
-	find_package_handle_standard_args(Libiconv DEFAULT_MSG ICONV_LIB ICONV_INCLUDE_DIR)
+	find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_LIB ICONV_INCLUDE_DIR)
 	mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIB)
 endif()