From: Navarrop <Pierre.Navarro@imag.fr>
Date: Thu, 31 Mar 2011 13:54:44 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3.6_beta2~78
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d73cc63ed2740fe67bf9c0ada4e70ca826600963?hp=1e9803272bf869acfca65f318c46bfd83e995788

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ae37c9e03..ae43da2853 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,12 +215,7 @@ endif(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
 
 ### Make tests
-if(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
-else(NOT WIN32)
-
-endif(NOT WIN32)
-
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 
 ### Setup the distrib