# HG changeset patch # User Gianfranco Costamagna # Date 1419852471 -3600 # Node ID 5e558e1931684e39e2dbf9533b774c95a5728e5f # Parent 37264e44ec0fb84c7056af567972724cdeada115 Use ghc return value instead of looking for the stderr, do not throw error when an haskell module throws a build failure, e.g. because of false positives like this one (debian/arm*) "You are using a new version of LLVM that hasn't been tested yet! We will try though..." diff -r 37264e44ec0f -r 5e558e193168 cmake_modules/CheckHaskellModuleExists.cmake --- a/cmake_modules/CheckHaskellModuleExists.cmake Sat Dec 27 11:36:28 2014 -0500 +++ b/cmake_modules/CheckHaskellModuleExists.cmake Mon Dec 29 12:27:51 2014 +0100 @@ -30,11 +30,11 @@ "-DPARAMETERS=${PARAMETERS}" -cpp -c "${CMAKE_MODULE_PATH}/checkModule.hs" + RESULT_VARIABLE COMMAND_RESULT ERROR_VARIABLE BUILD_ERROR OUTPUT_STRIP_TRAILING_WHITESPACE ) - - if("${BUILD_ERROR}" STREQUAL "") + if(${COMMAND_RESULT} EQUAL 0) message(STATUS "Looking for ${FUNCTION} in ${MODULE} - found") set(${VARIABLE} 1 CACHE INTERNAL "Have module ${MODULE}") file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log