Skip to content

Commit bf85c99

Browse files
lemniscatilemniscati
committed
Replace 'ICONV' by 'Iconv' in cmake/FindIconv.cmake to reduce warnings
1 parent cb19e3b commit bf85c99

1 file changed

Lines changed: 64 additions & 64 deletions

File tree

‎cmake/FindIconv.cmake‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,115 @@
11
include(CheckFunctionExists)
22

3-
set(_ICONV_SEARCHES)
3+
set(_Iconv_SEARCHES)
44

5-
# Search ICONV_DIR first if it is set.
6-
if(NOT ICONV_DIR AND ENV{ICONV_DIR})
7-
set(ICONV_DIR $ENV{ICONV_DIR})
5+
# Search Iconv_DIR first if it is set.
6+
if(NOT Iconv_DIR AND ENV{Iconv_DIR})
7+
set(Iconv_DIR $ENV{Iconv_DIR})
88
endif()
99

10-
if(ICONV_DIR)
11-
set(_ICONV_DIR_SEARCH PATHS ${ICONV_DIR} NO_DEFAULT_PATH)
12-
list(APPEND _ICONV_SEARCHES _ICONV_DIR_SEARCH)
10+
if(Iconv_DIR)
11+
set(_Iconv_DIR_SEARCH PATHS ${Iconv_DIR} NO_DEFAULT_PATH)
12+
list(APPEND _Iconv_SEARCHES _Iconv_DIR_SEARCH)
1313
endif()
1414

1515
# Normal search.
16-
set(_ICONV_SEARCH_NORMAL
16+
set(_Iconv_SEARCH_NORMAL
1717
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Iconv;InstallPath]"
1818
"$ENV{PROGRAMFILES}/iconv"
1919
ENV CPATH
2020
ENV C_INCLUDE_PATH
2121
ENV CPLUS_INCLUDE_PATH
2222
ENV LIBRARY_PATH)
23-
list(APPEND _ICONV_SEARCHES _ICONV_SEARCH_NORMAL)
23+
list(APPEND _Iconv_SEARCHES _Iconv_SEARCH_NORMAL)
2424

25-
set(ICONV_NAMES iconv iconv2 libiconv iconv64)
26-
set(ICONV_NAMES_DEBUG iconvd iconv64d)
25+
set(Iconv_NAMES iconv iconv2 libiconv iconv64)
26+
set(Iconv_NAMES_DEBUG iconvd iconv64d)
2727

2828
# Try each search configuration.
29-
foreach(search ${_ICONV_SEARCHES})
30-
find_path(ICONV_INCLUDE_DIR NAMES iconv.h ${${search}} PATH_SUFFIXES include)
29+
foreach(search ${_Iconv_SEARCHES})
30+
find_path(Iconv_INCLUDE_DIR NAMES iconv.h ${${search}} PATH_SUFFIXES include)
3131
endforeach()
3232

33-
# Allow ICONV_LIBRARY to be set manually, as the location of the iconv library
34-
if(NOT ICONV_LIBRARY)
35-
foreach(search ${_ICONV_SEARCHES})
36-
find_library(ICONV_LIBRARY_RELEASE NAMES ${ICONV_NAMES} ${${search}} PATH_SUFFIXES lib)
37-
find_library(ICONV_LIBRARY_DEBUG NAMES ${ICONV_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
33+
# Allow Iconv_LIBRARY to be set manually, as the location of the iconv library
34+
if(NOT Iconv_LIBRARY)
35+
foreach(search ${_Iconv_SEARCHES})
36+
find_library(Iconv_LIBRARY_RELEASE NAMES ${Iconv_NAMES} ${${search}} PATH_SUFFIXES lib)
37+
find_library(Iconv_LIBRARY_DEBUG NAMES ${Iconv_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
3838
endforeach()
3939

4040
include(SelectLibraryConfigurations)
41-
select_library_configurations(ICONV)
41+
select_library_configurations(Iconv)
4242
endif()
4343

44-
unset(ICONV_NAMES)
45-
unset(ICONV_NAMES_DEBUG)
44+
unset(Iconv_NAMES)
45+
unset(Iconv_NAMES_DEBUG)
4646

47-
if(ICONV_INCLUDE_DIR AND EXISTS "${ICONV_INCLUDE_DIR}/iconv.h")
48-
file(STRINGS "${ICONV_INCLUDE_DIR}/iconv.h" ICONV_H REGEX "^#define _LIBICONV_VERSION 0x([0-9]+)")
49-
string(REGEX MATCH "q#define _LIBICONV_VERSION 0x([0-9][0-9])([0-9][0-9])?([0-9][0-9])?.*" temp_match "${ICONV_H}")
47+
if(Iconv_INCLUDE_DIR AND EXISTS "${Iconv_INCLUDE_DIR}/iconv.h")
48+
file(STRINGS "${Iconv_INCLUDE_DIR}/iconv.h" Iconv_H REGEX "^#define _LIBIconv_VERSION 0x([0-9]+)")
49+
string(REGEX MATCH "q#define _LIBIconv_VERSION 0x([0-9][0-9])([0-9][0-9])?([0-9][0-9])?.*" temp_match "${Iconv_H}")
5050
unset(temp_match)
5151
if(CMAKE_MATCH_0)
52-
set(ICONV_VERSION_MAJOR "${CMAKE_MATCH_1}")
53-
set(ICONV_VERSION_MINOR "${CMAKE_MATCH_2}")
54-
set(ICONV_VERSION_PATCH "${CMAKE_MATCH_3}")
55-
string(REGEX REPLACE "0*([1-9][0-9]*).*" "\\1" ICONV_VERSION_MAJOR "${ICONV_VERSION_MAJOR}")
56-
string(REGEX REPLACE "0*([1-9][0-9]*).*" "\\1" ICONV_VERSION_MINOR "${ICONV_VERSION_MINOR}")
57-
string(REGEX REPLACE "0*([1-9][0-9]*).*" "\\1" ICONV_VERSION_PATCH "${ICONV_VERSION_PATCH}")
58-
59-
set(ICONV_VERSION_STRING "${ICONV_VERSION_MAJOR}.${ICONV_VERSION_MINOR}")
60-
if(ICONV_VERSION_PATCH)
61-
set(ICONV_VERSION_STRING "${ICONV_VERSION_STRING}.${ICONV_VERSION_PATCH}")
52+
set(Iconv_VERSION_MAJOR "${CMAKE_MATCH_1}")
53+
set(Iconv_VERSION_MINOR "${CMAKE_MATCH_2}")
54+
set(Iconv_VERSION_PATCH "${CMAKE_MATCH_3}")
55+
string(REGEX REPLACE "0*([1-9][0-9]*).*" "\\1" Iconv_VERSION_MAJOR "${Iconv_VERSION_MAJOR}")
56+
string(REGEX REPLACE "0*([1-9][0-9]*).*" "\\1" Iconv_VERSION_MINOR "${Iconv_VERSION_MINOR}")
57+
string(REGEX REPLACE "0*([1-9][0-9]*).*" "\\1" Iconv_VERSION_PATCH "${Iconv_VERSION_PATCH}")
58+
59+
set(Iconv_VERSION_STRING "${Iconv_VERSION_MAJOR}.${Iconv_VERSION_MINOR}")
60+
if(Iconv_VERSION_PATCH)
61+
set(Iconv_VERSION_STRING "${Iconv_VERSION_STRING}.${Iconv_VERSION_PATCH}")
6262
endif()
6363
endif()
6464
endif()
6565

66-
check_function_exists(iconv_open ICONV_IN_GLIBC)
66+
check_function_exists(iconv_open Iconv_IN_GLIBC)
6767

68-
set(ICONV_FOUND_ANY FALSE)
69-
if(ICONV_IN_GLIBC OR ICONV_LIBRARY)
70-
set(ICONV_FOUND_ANY TRUE)
68+
set(Iconv_FOUND_ANY FALSE)
69+
if(Iconv_IN_GLIBC OR Iconv_LIBRARY)
70+
set(Iconv_FOUND_ANY TRUE)
7171
endif()
7272

73-
# handle the QUIETLY and REQUIRED arguments and set ICONV_FOUND to TRUE if
73+
# handle the QUIETLY and REQUIRED arguments and set Iconv_FOUND to TRUE if
7474
# all listed variables are TRUE
7575
include(FindPackageHandleStandardArgs)
76-
find_package_handle_standard_args(ICONV
77-
REQUIRED_VARS ICONV_FOUND_ANY ICONV_INCLUDE_DIR
78-
VERSION_VAR ICONV_VERSION_STRING)
76+
find_package_handle_standard_args(Iconv
77+
REQUIRED_VARS Iconv_FOUND_ANY Iconv_INCLUDE_DIR
78+
VERSION_VAR Iconv_VERSION_STRING)
7979

80-
mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR)
80+
mark_as_advanced(Iconv_LIBRARY Iconv_INCLUDE_DIR)
8181

82-
if(NOT ICONV_FOUND)
82+
if(NOT Iconv_FOUND)
8383
return()
8484
endif()
8585

86-
set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR})
86+
set(Iconv_INCLUDE_DIRS ${Iconv_INCLUDE_DIR})
8787

88-
if(NOT ICONV_LIBRARIES)
89-
set(ICONV_LIBRARIES ${ICONV_LIBRARY})
88+
if(NOT Iconv_LIBRARIES)
89+
set(Iconv_LIBRARIES ${Iconv_LIBRARY})
9090
endif()
9191

92-
if(ICONV_LIBRARY AND NOT TARGET ICONV::ICONV)
93-
add_library(ICONV::ICONV UNKNOWN IMPORTED)
94-
set_target_properties(ICONV::ICONV PROPERTIES
95-
INTERFACE_INCLUDE_DIRECTORIES "${ICONV_INCLUDE_DIRS}"
96-
IMPORTED_LOCATION "${ICONV_LIBRARY}")
92+
if(Iconv_LIBRARY AND NOT TARGET Iconv::Iconv)
93+
add_library(Iconv::Iconv UNKNOWN IMPORTED)
94+
set_target_properties(Iconv::Iconv PROPERTIES
95+
INTERFACE_INCLUDE_DIRECTORIES "${Iconv_INCLUDE_DIRS}"
96+
IMPORTED_LOCATION "${Iconv_LIBRARY}")
9797

98-
if(ICONV_LIBRARY_RELEASE)
99-
set_property(TARGET ICONV::ICONV APPEND PROPERTY
98+
if(Iconv_LIBRARY_RELEASE)
99+
set_property(TARGET Iconv::Iconv APPEND PROPERTY
100100
IMPORTED_CONFIGURATIONS RELEASE)
101-
set_target_properties(ICONV::ICONV PROPERTIES
102-
IMPORTED_LOCATION_RELEASE "${ICONV_LIBRARY_RELEASE}")
101+
set_target_properties(Iconv::Iconv PROPERTIES
102+
IMPORTED_LOCATION_RELEASE "${Iconv_LIBRARY_RELEASE}")
103103
endif()
104104

105-
if(ICONV_LIBRARY_DEBUG)
106-
set_property(TARGET ICONV::ICONV APPEND PROPERTY
105+
if(Iconv_LIBRARY_DEBUG)
106+
set_property(TARGET Iconv::Iconv APPEND PROPERTY
107107
IMPORTED_CONFIGURATIONS DEBUG)
108-
set_target_properties(ICONV::ICONV PROPERTIES
109-
IMPORTED_LOCATION_DEBUG "${ICONV_LIBRARY_DEBUG}")
108+
set_target_properties(Iconv::Iconv PROPERTIES
109+
IMPORTED_LOCATION_DEBUG "${Iconv_LIBRARY_DEBUG}")
110110
endif()
111-
elseif(NOT TARGET ICONV::ICONV)
112-
add_library(ICONV::ICONV INTERFACE IMPORTED)
113-
set_target_properties(ICONV::ICONV PROPERTIES
114-
INTERFACE_INCLUDE_DIRECTORIES "${ICONV_INCLUDE_DIRS}")
111+
elseif(NOT TARGET Iconv::Iconv)
112+
add_library(Iconv::Iconv INTERFACE IMPORTED)
113+
set_target_properties(Iconv::Iconv PROPERTIES
114+
INTERFACE_INCLUDE_DIRECTORIES "${Iconv_INCLUDE_DIRS}")
115115
endif()

0 commit comments

Comments
 (0)