From 43c76c916481a4d7107edddc16db8c3bde07a94d Mon Sep 17 00:00:00 2001 From: Emmanuel Bouthenot Date: Sat, 3 Oct 2009 14:56:02 +0200 Subject: [PATCH] Replace MATCHES by STREQUAL in cmake: fix a fail to build on kFreeBSD --- cmake/FindGettext.cmake | 6 +++--- src/CMakeLists.txt | 4 ++-- src/core/CMakeLists.txt | 6 +++--- src/gui/curses/CMakeLists.txt | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index 3b06d4dc2..b711de29d 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -52,12 +52,12 @@ IF(HAVE_LIBINTL_H) /usr/lib ) IF(LIBINTL_LIBRARY) - IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") + IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") SET(CMAKE_REQUIRED_LIBRARIES "iconv") CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT) - ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT) - ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") IF(LIBINTL_HAS_DGETTEXT) SET(GETTEXT_FOUND TRUE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index df2e92c6f..a001979cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,9 +34,9 @@ CHECK_INCLUDE_FILES("pwd.h" HAVE_PWD_H) CHECK_INCLUDE_FILES("errno.h" HAVE_ERRNO_H) CHECK_INCLUDE_FILES("wchar.h" HAVE_WCHAR_H) CHECK_INCLUDE_FILES("langinfo.h" HAVE_LANGINFO_CODESET) -IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") CHECK_INCLUDE_FILES("utf8/wchar.h" HAVE_UTF8_WCHAR_H) -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME) CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ae4b7b262..2710308d1 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -39,13 +39,13 @@ INCLUDE(CheckSymbolExists) CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H) CHECK_SYMBOL_EXISTS(flock "sys/file.h" HAVE_FLOCK) -IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") FIND_LIBRARY(EXECINFO_LIB_PATH execinfo /usr/local/lib) SET(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}") CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE) -ELSE(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") CHECK_SYMBOL_EXISTS(backtrace "execinfo.h" HAVE_BACKTRACE) -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") IF(GNUTLS_FOUND) INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_PATH}) diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index 5c2e2a1e2..9b196dc2d 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -44,15 +44,15 @@ IF(NCURSES_FOUND) LIST(APPEND EXTRA_LIBS ${NCURSES_LIBRARY}) ENDIF(NCURSES_FOUND) -IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") LIST(APPEND EXTRA_LIBS "utf8") -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") -IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") IF(HAVE_BACKTRACE) LIST(APPEND EXTRA_LIBS "execinfo") ENDIF(HAVE_BACKTRACE) -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_CURSES_SRC})