X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8b31411ad567a87b51085f1514b1ecaca54c47b6..b5f695c9d15c6436cefa8a871e0c16397ff7325e:/buildtools/Cmake/CompleteInFiles.cmake diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 73108175fb..ba8db2baf1 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -634,20 +634,18 @@ if (NOT CMAKE_CROSSCOMPILING) try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c + RUN_OUTPUT_VARIABLE stack ) - if (RUN_makecontext_VAR) - file(READ "${CMAKE_BINARY_DIR}/conftestval" stack) - if(stack MATCHES "down") - set(PTH_STACKGROWTH "-1") - endif() - if(stack MATCHES "up") - set(PTH_STACKGROWTH "1") - endif() - endif() endif() -if(NOT PTH_STACKGROWTH) +if("${stack}" STREQUAL "down") + set(PTH_STACKGROWTH "-1") +elseif("${stack}" STREQUAL "up") + set(PTH_STACKGROWTH "1") +else() if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") set(PTH_STACKGROWTH "-1") + elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") + set(PTH_STACKGROWTH "-1") else() message(ERROR "Could not figure the stack direction.") endif()