valgrind version checking rule did not match 3.10.0

[simgrid.git] / tools / cmake / PrintArgs.cmake

diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake
index 971b768..4acd4e0 100644 (file)
--- a/tools/cmake/PrintArgs.cmake
+++ b/tools/cmake/PrintArgs.cmake
@@ -16,18 +16,15 @@ if(enable_print_message)
   message("\#define __VA_COPY_USE          ${__VA_COPY_USE}")
   message("HAVE_UCONTEXT ...............: ${HAVE_UCONTEXT}")
   message("")
-  message("HAVE_PTHREAD_CREATE .........: ${pthread}")
+  message("HAVE_PTHREAD ................: ${HAVE_PTHREAD}")
   message("HAVE_SEM_INIT ...............: ${HAVE_SEM_INIT_LIB}")
   message("HAVE_SEM_TIMEDWAIT ..........: ${HAVE_SEM_TIMEDWAIT_LIB}")
   message("HAVE_MUTEX_TIMEDLOCK ........: ${HAVE_MUTEX_TIMEDLOCK_LIB}")
   message("HAVE_POSIX_GETTIME ..........: ${HAVE_POSIX_GETTIME}")
   message("")
-  message("TIME_WITH_SYS_TIME ..........: ${TIME_WITH_SYS_TIME}")
   message("STDC_HEADERS ................: ${STDC_HEADERS}")
-  message("HAVE_PTHREAD_H ..............: ${HAVE_PTHREAD_H}")
   message("HAVE_VALGRIND_VALGRIND_H ....: ${HAVE_VALGRIND_VALGRIND_H}")
   message("HAVE_SOCKET_H ...............: ${HAVE_SOCKET_H}")
-  message("HAVE_SYS_SOCKET_H ...........: ${HAVE_SYS_SOCKET_H}")
   message("HAVE_STAT_H .................: ${HAVE_STAT_H}")
   message("HAVE_SYS_STAT_H .............: ${HAVE_SYS_STAT_H}")
   message("HAVE_WINDOWS_H ..............: ${HAVE_WINDOWS_H}")
@@ -38,10 +35,6 @@ if(enable_print_message)
   message("HAVE_SYS_TIME_H .............: ${HAVE_SYS_TIME_H}")
   message("HAVE_TIME_H .................: ${HAVE_TIME_H}")
   message("HAVE_DLFCN_H ................: ${HAVE_DLFCN_H}")
-  message("HAVE_INTTYPES_H .............: ${HAVE_INTTYPES_H}")
-  message("HAVE_MEMORY_H ...............: ${HAVE_MEMORY_H}")
-  message("HAVE_STDLIB_H ...............: ${HAVE_STDLIB_H}")
-  message("HAVE_STRINGS_H ..............: ${HAVE_STRINGS_H}")
   message("HAVE_STRING_H ...............: ${HAVE_STRING_H}")
   message("HAVE_STDIO_H ................: ${HAVE_STDIO_H}")
 
@@ -81,18 +74,23 @@ else()
 endif()
 message("")
 message("        Compiler: C .................: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})")
-message("                version .............: ${COMPILER_C_VERSION}")
+message("                version .............: ${CMAKE_C_COMPILER_VERSION}")
 if(CMAKE_CXX_COMPILER)
   message("        Compiler: C++ ...............: ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})")
-  message("                version .............: ${COMPILER_CXX_VERSION}")
+  message("                version .............: ${CMAKE_CXX_COMPILER_VERSION}")
 endif()
-if(HAVE_Java)
+if(${Java_FOUND})
   message("        Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}")
   message("                version .............: ${Java_VERSION_STRING}")
+if(${SWIG_FOUND})
+  message("                SWIG ................: Version ${SWIG_VERSION} found.")
+else()
+  message("                SWIG ................: Missing.")
+endif()
 endif()
 if(CMAKE_Fortran_COMPILER)
   message("        Compiler: Fortran ...........: ${CMAKE_Fortran_COMPILER} (${CMAKE_Fortran_COMPILER_ID})")
-  message("                version .............: ${COMPILER_Fortran_VERSION}")
+  message("                version .............: ${CMAKE_Fortran_COMPILER_VERSION}")
 endif()
 message("        Linker: .....................: ${CMAKE_LINKER}")
 message("                version .............: ${LINKER_VERSION}")
@@ -109,7 +107,7 @@ else()
   message("        Compile NS-3 ................: NO  (hint: ${NS3_HINT})")
 endif()
 
-if (HAVE_Java)
+if (${Java_FOUND})
   message("        Compile Java ................: yes")
   message("          Native lib in jar .........: ${enable_lib_in_jar}")
 else()
@@ -122,7 +120,6 @@ message("        Compile MPI testsuite .......: ${enable_smpi_MPICH3_testsuite}"
 message("        Compile Smpi f77 ............: ${SMPI_FORTRAN}")
 message("        Compile Smpi f90 ............: ${SMPI_FORTRAN}")
 message("        Compile Boost.Context support: ${HAVE_BOOST_CONTEXT}")
-message("        Compile Static ..............: ${enable_lib_static}")
 message("")
 message("        Maintainer mode .............: ${enable_maintainer_mode}")
 message("        Documentation................: ${enable_documentation}")