X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b16e70295c7f0ab1b715ac0ebc3a9b686fa16011..ad9181ca3aecc03d492eeb63def4370769a32d00:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 104ba06dac..4176da3dff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 # Java requires 2.8.6
+message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
 project(SimGrid C CXX)
 
@@ -168,7 +169,6 @@ set(INCLUDES
 if(WIN32)
   set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch]
 endif()
-set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
   set(INCLUDES ${INCLUDES} /usr/include/)
@@ -273,7 +273,17 @@ if(enable_memcheck_xml)
   set(enable_memcheck true)
 endif()
 
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake)
+INCLUDE(CTest)
+ENABLE_TESTING()
+if(WIN32)
+  add_test(
+      NAME basic-java
+      COMMAND java -classpath ".;${CMAKE_HOME_DIRECTORY}\\simgrid.jar" masterslave.Masterslave ..\\platforms\\platform.xml masterslave\\masterslaveDeployment.xml
+      WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}\\examples\\java
+  )
+else()
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake)
+endif()
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 
 ### Setup the distrib