Cosmetics and again windows compilation.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7780 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3e6ed5..1c9af54 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,12 +10,16 @@ set(libsmpi_version "${release_version}")
 exec_program("${CMAKE_COMMAND} -E remove -f ${simgrid_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
 
 if(WIN32)
-    message("C_COMPILER                        $ENV{CC}")
-    message("CXX_COMPILER              $ENV{CXX}")
-    message("MAKE_PROGRAM              ${CMAKE_MAKE_PROGRAM}")
-    message("RC_COMPILER               $ENV{RC}")
-    message("INCLUDE                   $ENV{INCLUDE}")
-    message("LIB                               $ENV{LIB}")
+       message("       Be sure all those variables are correctely set.")
+    message("          -- C_COMPILER                   $ENV{CC}")
+    message("          -- CXX_COMPILER                 $ENV{CXX}")    
+    message("          -- RC_COMPILER                  $ENV{RC}")
+    message("          -- INCLUDE                      $ENV{INCLUDE}")
+    message("          -- LIB                          $ENV{LIB}")
+    message("          -- MAKE_PROGRAM                 ${CMAKE_MAKE_PROGRAM}")
+    message("          -- CMAKE_BUILD_TOOL                     ${CMAKE_BUILD_TOOL}")
+    message("          -- LINKER                               ${CMAKE_LINKER}")
+    message("          -- CMAKE_GENERATOR                      ${CMAKE_GENERATOR}\n\n")
 endif(WIN32)
 
 ### Find programs and paths

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 12e13ed..e6a65cc 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -570,15 +570,12 @@ foreach(fct ${diff_va})
            exit(0);
        }"
        )
-       try_run(RUN_VA_NULL_VAR COMPILE_VA_NULL_VAR
+       try_compile(COMPILE_VA_NULL_VAR
        ${PROJECT_DIRECTORY}
        ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_va_copy.c
        )
-       if(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN")
-       else(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN")   
-
+       if(COMPILE_VA_NULL_VAR)
                string(REGEX REPLACE "\;" "" fctbis ${fct})
-
                if(${fctbis} STREQUAL "va_copy((d),(s))")
                        set(HAVE_VA_COPY 1)
                        set(ac_cv_va_copy "C99")
@@ -624,8 +621,9 @@ foreach(fct ${diff_va})
                set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}")
                endif(NOT STATUS_OK)
                set(STATUS_OK "1")
-
-       endif(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN")
+               
+       endif(COMPILE_VA_NULL_VAR)
+       
 endforeach(fct ${diff_va})
 
 #--------------------------------------------------------------------------------------------------

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 3e027f8..761c863 100644 (file)
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -71,23 +71,27 @@ if(enable_print_message)
        message("HAVE_ASPRINTF                  ${HAVE_ASPRINTF}")
        message("HAVE_VASPRINTF                 ${HAVE_VASPRINTF}")
        message("HAVE_MMAP                      ${HAVE_MMAP}")
-
+       if(enable_ruby)
        message("")
        message("RUBY_EXE :                     ${RUBY_EXECUTABLE}")
        message("RUBY.H :                       ${RUBY_INCLUDE_DIR}")
        message("CONFIG.H :                     ${RUBY_CONFIG_INCLUDE_DIR}")
        message("LIB_RUBY :                     ${RUBY_LIBRARY}")
-       message("LIB_RUBY_VERSION :     ${LIB_RUBY_VERSION}")
+       message("LIB_RUBY_VERSION :             ${LIB_RUBY_VERSION}")
+       endif(enable_ruby)
+       if(enable_java)
        message("")
-       
        message("JNI.H :                        ${JAVA_INCLUDE_PATH}")
        message("JNI_MD.H :                     ${JAVA_INCLUDE_PATH2}")
        message("JAVAC :                        ${JAVA_COMPILE}")
-       message("CMAKE_JAVA_COMPILER        :   ${CMAKE_JAVA_COMPILER}")
-       message("CMAKE_JAVA_LINK_EXECUTABLE :   ${CMAKE_JAVA_LINK_EXECUTABLE}")
+       message("JAVA_ARCHIVE :                         ${JAVA_ARCHIVE}")
+       endif(enable_java)
+       if(enable_lua)
+       message("")
        message("LUALIB.H:                      ${HAVE_LUA5_1_LUALIB_H}")
        message("LAUXLIB.H:                     ${HAVE_LUA5_1_LAUXLIB_H}")
        message("LUA_VERSION :                  ${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION}")
+       endif(enable_lua)
        message("________________________________________________________________________________")
        message("________________________________________________________________________________ DEBUG END")
        message("")
@@ -118,6 +122,7 @@ message("   Compile Smpi   :        ${enable_smpi}")
 message("      Maintainer mode:        ${enable_maintainer_mode}")
 message("      Supernovae mode:        ${enable_supernovae}")
 message("      Tracing mode   :        ${enable_tracing}")
+message("      Model checking :        ${enable_model-checking}")
 message("")
 message("      Simgrid dependencies:   ${SIMGRID_DEP}")
 message("      Gras dependencies   :   ${GRAS_DEP}")