mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 07:11:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindIntl: Fix detection of intl built in to C library

Browse Source 
Since commit c30d06b7e6 (FindIntl: Add imported target, 2020-10-06,
v3.20.0-rc1~687^2) we use `check_symbol_exists` to check whether the
`intl` library is built in to the C library.  On some platforms the
tested symbols are provided as macros so the check passes without
linking any symbol.  Instead, check whether a sample source file both
compiles and links.

Fixes: #21979
This commit is contained in:
Brad King
2021-03-26 10:52:30 -04:00
parent cb0d1a49e6
commit e34d64c04d
2 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Help/release/3.20.rst
View File

@@ -327,3 +327,17 @@ Other Changes
`cmake.org <https://cmake.org/download/>`_ have changed their naming pattern
to ``cmake-$ver-windows-$arch``, where ``$arch`` is either ``x86_64`` or
``i386``.
Updates
=======
Changes made since CMake 3.20.0 include the following.
3.20.1
------
* The :module:`FindIntl` module in CMake 3.20.0 added checks
``Intl_HAVE_GETTEXT_BUILTIN``, ``Intl_HAVE_DCGETTEXT_BUILTIN``,
and ``Intl_IS_BUILTIN``, but they were not implemented correctly.
These have been removed and replaced with a single ``Intl_IS_BUILT_IN``
check, whose name is consistent with the :module:`FindIconv` module.

94
Modules/FindIntl.cmake
View File

@@ -37,24 +37,11 @@ The following cache variables may also be set:
The libintl library (if any)
.. variable:: Intl_HAVE_GETTEXT_BUILTIN
.. variable:: Intl_IS_BUILT_IN
.. versionadded:: 3.20
True if gettext is in the C library
.. variable:: Intl_HAVE_DCGETTEXT_BUILTIN
.. versionadded:: 3.20
True if dcgettext is in the C library
.. variable:: Intl_IS_BUILTIN
.. versionadded:: 3.20
whether intl is a part of the C library determined from the result of
Intl_HAVE_GETTEXT_BUILTIN and Intl_HAVE_DCGETTEXT_BUILTIN
whether ``intl`` is a part of the C library.
.. note::
On some platforms, such as Linux with GNU libc, the gettext
@@ -68,46 +55,73 @@ The following cache variables may also be set:
#]=======================================================================]
include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CheckSymbolExists.cmake)
# Check if we have libintl is a part of libc
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_QUIET TRUE)
check_symbol_exists(gettext libintl.h Intl_HAVE_GETTEXT_BUILTIN)
check_symbol_exists(dcgettext libintl.h Intl_HAVE_DCGETTEXT_BUILTIN) # redundant check
cmake_pop_check_state()
if(Intl_HAVE_GETTEXT_BUILTIN AND Intl_HAVE_DCGETTEXT_BUILTIN)
set(Intl_IS_BUILTIN TRUE)
if(CMAKE_C_COMPILER_LOADED)
include(${CMAKE_CURRENT_LIST_DIR}/CheckCSourceCompiles.cmake)
elseif(CMAKE_CXX_COMPILER_LOADED)
include(${CMAKE_CURRENT_LIST_DIR}/CheckCXXSourceCompiles.cmake)
else()
set(Intl_IS_BUILTIN FALSE)
# If neither C nor CXX are loaded, implicit intl makes no sense.
set(Intl_IS_BUILT_IN FALSE)
endif()
# Find include directory
find_path(Intl_INCLUDE_DIR
NAMES "libintl.h"
DOC "libintl include directory")
mark_as_advanced(Intl_INCLUDE_DIR)
# Check if Intl is built in to the C library.
if(NOT DEFINED Intl_IS_BUILT_IN)
if(NOT DEFINED Intl_INCLUDE_DIR AND NOT DEFINED Intl_LIBRARY)
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_QUIET TRUE)
set(Intl_IMPLICIT_TEST_CODE [[
#include <libintl.h>
int main(void) {
gettext("");
dgettext("", "");
dcgettext("", "", 0);
return 0;
}
]])
if(CMAKE_C_COMPILER_LOADED)
check_c_source_compiles("${Intl_IMPLICIT_TEST_CODE}" Intl_IS_BUILT_IN)
else()
check_cxx_source_compiles("${Intl_IMPLICIT_TEST_CODE}" Intl_IS_BUILT_IN)
endif()
cmake_pop_check_state()
else()
set(Intl_IS_BUILT_IN FALSE)
endif()
endif()
set(_Intl_REQUIRED_VARS)
if(Intl_IS_BUILT_IN)
set(_Intl_REQUIRED_VARS _Intl_IS_BUILT_IN_MSG)
set(_Intl_IS_BUILT_IN_MSG "built in to C library")
else()
set(_Intl_REQUIRED_VARS Intl_LIBRARY Intl_INCLUDE_DIR)
find_path(Intl_INCLUDE_DIR
NAMES "libintl.h"
DOC "libintl include directory")
mark_as_advanced(Intl_INCLUDE_DIR)
# Find all Intl libraries
set(Intl_REQUIRED_VARS)
if(NOT Intl_IS_BUILTIN)
find_library(Intl_LIBRARY "intl" "libintl" NAMES_PER_DIR
DOC "libintl libraries (if not in the C library)")
mark_as_advanced(Intl_LIBRARY)
list(APPEND Intl_REQUIRED_VARS Intl_LIBRARY)
endif()
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Intl
FOUND_VAR Intl_FOUND
REQUIRED_VARS Intl_INCLUDE_DIR ${Intl_REQUIRED_VARS}
REQUIRED_VARS ${_Intl_REQUIRED_VARS}
FAIL_MESSAGE "Failed to find Gettext libintl")
unset(Intl_REQUIRED_VARS)
unset(_Intl_REQUIRED_VARS)
unset(_Intl_IS_BUILT_IN_MSG)
if(Intl_FOUND)
set(Intl_INCLUDE_DIRS "${Intl_INCLUDE_DIR}")
set(Intl_LIBRARIES "${Intl_LIBRARY}")
if(Intl_IS_BUILT_IN)
set(Intl_INCLUDE_DIRS "")
set(Intl_LIBRARIES "")
else()
set(Intl_INCLUDE_DIRS "${Intl_INCLUDE_DIR}")
set(Intl_LIBRARIES "${Intl_LIBRARY}")
endif()
if(NOT TARGET Intl::Intl)
add_library(Intl::Intl INTERFACE IMPORTED)
set_target_properties(Intl::Intl PROPERTIES