From a0d870c7bcd2de7dbf0010f99ef9cd5b85f8bff5 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 2 Mar 2015 12:31:57 +0100 Subject: [PATCH] Fix libintl search on Linux when building with CMake. --- cmake/FindIntl.cmake | 21 +++++++++++---------- gtk/CMakeLists.txt | 5 ++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cmake/FindIntl.cmake b/cmake/FindIntl.cmake index 3d0e56992..a974801fa 100644 --- a/cmake/FindIntl.cmake +++ b/cmake/FindIntl.cmake @@ -41,16 +41,17 @@ if(INTL_INCLUDE_DIRS) set(HAVE_LIBINTL_H 1) endif() -find_library(INTL_LIBRARIES - NAMES intl - HINTS ${_INTL_ROOT_PATHS} - PATH_SUFFIXES bin lib -) +set(INTL_ARGS INTL_INCLUDE_DIRS HAVE_LIBINTL_H) +if(NOT UNIX OR APPLE) + find_library(INTL_LIBRARIES + NAMES intl + HINTS ${_INTL_ROOT_PATHS} + PATH_SUFFIXES bin lib + ) + list(APPEND INTL_ARGS INTL_LIBRARIES) +endif() include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Intl - DEFAULT_MSG - INTL_INCLUDE_DIRS INTL_LIBRARIES HAVE_LIBINTL_H -) +find_package_handle_standard_args(Intl DEFAULT_MSG ${INTL_ARGS}) -mark_as_advanced(INTL_INCLUDE_DIRS INTL_LIBRARIES HAVE_LIBINTL_H) +mark_as_advanced(${INTL_ARGS}) diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 8957458eb..fb07862b6 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -85,7 +85,10 @@ else() endif() set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone) target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS} ${INTL_INCLUDE_DIRS}) -target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES} ${INTL_LIBRARIES}) +target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES}) +if(INTL_LIBRARIES) + target_link_libraries(linphone-gtk ${INTL_LIBRARIES}) +endif() if(WIN32) target_link_libraries(linphone-gtk Wininet) endif()