From: navarrop Date: Mon, 6 Dec 2010 13:50:15 +0000 (+0000) Subject: Remove old variable with_context. X-Git-Tag: v3.6_beta2~912 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eee49aeac605271b0689346297a065c4976f5dc5 Remove old variable with_context. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9011 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index be1ac6ad22..39107f506c 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -203,20 +203,15 @@ if(mcsc MATCHES "no" AND pthread) endif(HAVE_WINDOWS_H) endif(mcsc MATCHES "no" AND pthread) -if(with_context MATCHES "ucontext" AND mcsc MATCHES "no") - message(FATAL_ERROR "-Dwith-context=ucontext specified but ucontext unusable.") -endif(with_context MATCHES "ucontext" AND mcsc MATCHES "no") - #Only windows -if(with_context MATCHES "windows") +if(WIN32) if(NOT HAVE_WINDOWS_H) message(FATAL_ERROR "no appropriate backend found windows") endif(NOT HAVE_WINDOWS_H) -endif(with_context MATCHES "windows") +endif(WIN32) if(windows_context MATCHES "yes") - set(with_context "windows") message(STATUS "Context change to windows") endif(windows_context MATCHES "yes") diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index 06dd62ada3..82a6439aa5 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -13,12 +13,6 @@ else(NOT CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project") endif(NOT CMAKE_INSTALL_PREFIX) -set(with_context ${with_context} CACHE TYPE INTERNAL FORCE) - -if(NOT with_context) - set(with_context "auto" CACHE TYPE INTERNAL FORCE) -endif(NOT with_context) - set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE) option(enable_gtnets "Whether gtnets model is activated." on)