From 9fa44c1b1c8fbcc84da2a7398cb0bf3e93d54ee0 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Fri, 31 Jul 2015 09:06:32 +0200 Subject: [PATCH] Fixed libintl not being found in libc & made the test scripts call sh on windows --- .cmake/Modules/FindLibintl.cmake | 4 ++-- samples/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cmake/Modules/FindLibintl.cmake b/.cmake/Modules/FindLibintl.cmake index dad2634..90c9d85 100644 --- a/.cmake/Modules/FindLibintl.cmake +++ b/.cmake/Modules/FindLibintl.cmake @@ -36,8 +36,8 @@ find_path(LIBINTL_INCLUDE_DIR libintl.h set(LIBINTL_LIB_FOUND FALSE) if(LIBINTL_INCLUDE_DIR) - include(CheckFunctionExists) - check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT) + include(CheckSymbolExists) + check_symbol_exists(dgettext libintl.h LIBINTL_LIBC_HAS_DGETTEXT) if (LIBINTL_LIBC_HAS_DGETTEXT) set(LIBINTL_LIBRARIES) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index ead99be..116c8a9 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -37,5 +37,5 @@ foreach(sample ${SAMPLES}) endforeach() foreach(script ${SCRIPTS}) - add_test(${script} ${CMAKE_CURRENT_LIST_DIR}/tests/${script}.sh) + add_test(${script} sh ${CMAKE_CURRENT_LIST_DIR}/tests/${script}.sh) endforeach()