merge conflicts

[simgrid.git] / buildtools / Cmake / Pipol.cmake

diff --git a/buildtools/Cmake/Pipol.cmake b/buildtools/Cmake/Pipol.cmake
index c715618..b01c574 100644 (file)
--- a/buildtools/Cmake/Pipol.cmake
+++ b/buildtools/Cmake/Pipol.cmake
@@ -6,15 +6,63 @@
 # ssh/rsync mandatory 
 IF(pipol_user)
 
+       set(CMAKE_OPTIONS "     -Wno-dev")
+       
+       if(custom_flags)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Dcustom_flags=${custom_flags}")
+       endif(custom_flags)
+       
+       if(with_context)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Dwith_context=${with_context}")
+       endif(with_context)
+       
+       if(enable_smpi)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_smpi=on")
+       endif(enable_smpi)
+       
+       if(enable_lua)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_lua=on")
+       endif(enable_lua)       
+       
+       if(enable_compile_optimizations)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_compile_optimizations=on")
+       endif(enable_compile_optimizations)
+       
+       if(enable_compile_warnings)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_compile_warnings=on")
+       endif(enable_compile_warnings)  
+       
+       if(enable_tracing)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_tracing=on")
+       endif(enable_tracing)
+       
+       if(enable_coverage)
+       set(CMAKE_OPTIONS "${CMAKE_OPTION}      -Denable_coverage=on")
+       endif(enable_coverage)  
+       
+       if(enable_print_message)        
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_print_message=on")
+       endif(enable_print_message)     
+       
+       if(enable_model-checking)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_model-checking=on")
+       endif(enable_model-checking)
+       
+    if(enable_latency_bound_tracking)
+       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_latency_bound_tracking=on")
+       endif(enable_latency_bound_tracking)
+
        FIND_PROGRAM(HAVE_SSH ssh)
        FIND_PROGRAM(HAVE_RSYNC rsync)
 
     MESSAGE(STATUS "Pipol user is ${pipol_user}")
     IF(HAVE_SSH)
+       message(STATUS "Found ssh: ${HAVE_SSH}")
       # get pipol systems
       EXECUTE_PROCESS(COMMAND 
         ssh ${pipol_user}@pipol.inria.fr pipol-sub --query=systems 
         OUTPUT_VARIABLE PIPOL_SYSTEMS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        
     ENDIF(HAVE_SSH)
   
        ADD_CUSTOM_TARGET(pipol_test_list_images
@@ -34,7 +82,7 @@ IF(pipol_user)
                )
   
     IF(HAVE_RSYNC)
-             
+       message(STATUS "Found rsync: ${HAVE_RSYNC}")
              MACRO(PIPOL_TARGET
                  SYSTEM_PATTERN)
                                  STRING(REPLACE ".dd.gz" "" SYSTEM_TARGET ${SYSTEM_PATTERN})
@@ -47,7 +95,8 @@ IF(pipol_user)
                                \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \;
                                cd ${CMAKE_HOME_DIRECTORY} \;
                                sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \;
-                               cmake ${CMAKE_HOME_DIRECTORY} \;
+                               cmake -E remove CMakeCache.txt \;
+                               cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \;
                                make clean \;
                                make \;
                                make check \"
@@ -60,7 +109,8 @@ IF(pipol_user)
                                \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \;
                                cd ${CMAKE_HOME_DIRECTORY} \;
                                sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \;
-                               cmake ${CMAKE_HOME_DIRECTORY} \;
+                               cmake -E remove CMakeCache.txt \;
+                               cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \;
                                ctest -D Experimental \"
                                )
                                
@@ -75,7 +125,8 @@ IF(pipol_user)
                                        \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \;
                                        cd ${CMAKE_HOME_DIRECTORY} \;
                                        sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \;
-                                       cmake ${CMAKE_HOME_DIRECTORY} \;
+                                       cmake -E remove CMakeCache.txt \;
+                                       cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \;
                                        ctest -D Experimental \"
                                         )
                                endif(NOT make_test)
@@ -104,4 +155,11 @@ IF(PIPOL_SYSTEMS)
   ENDFOREACH(SYSTEM ${PIPOL_SYSTEMS})
 ENDIF(PIPOL_SYSTEMS)
 
+ADD_CUSTOM_TARGET(pipol_kill_all_jobs
+               COMMENT "PIPOL delete all jobs"
+               COMMAND ./pipol-sub --pipol-user=${pipol_user} deleteallmyjobs
+               )
+               
+message(STATUS "Pipol options: ${CMAKE_OPTIONS}")
+               
 ENDIF(pipol_user)
\ No newline at end of file