A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Again for windows.
[simgrid.git]
/
buildtools
/
Cmake
/
src
/
CMakePrintArgs.txt
diff --git
a/buildtools/Cmake/src/CMakePrintArgs.txt
b/buildtools/Cmake/src/CMakePrintArgs.txt
index
61f46d6
..
3e027f8
100644
(file)
--- a/
buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/
buildtools/Cmake/src/CMakePrintArgs.txt
@@
-1,10
+1,16
@@
-exec_program("echo `${CMAKE_C_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`" OUTPUT_VARIABLE "COMPILER_C_VERSION")
-exec_program("echo `${CMAKE_CXX_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`" OUTPUT_VARIABLE "COMPILER_CXX_VERSION")
+exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
+exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION")
+
+string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}")
+string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_CXX_VERSION "${COMPILER_CXX_VERSION}")
if(enable_print_message)
message("")
message("________________________________________________________________________________")
message("________________________________________________________________________________ DEBUG")
if(enable_print_message)
message("")
message("________________________________________________________________________________")
message("________________________________________________________________________________ DEBUG")
+ message("simgrid_BINARY_DIR : ${simgrid_BINARY_DIR}")
+ message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}")
+ message("")
message("SIZEOF_MAX : ${SIZEOF_MAX}")
message("PTH_STACKGROWTH ${PTH_STACKGROWTH}")
message("need_getline ${need_getline}")
message("SIZEOF_MAX : ${SIZEOF_MAX}")
message("PTH_STACKGROWTH ${PTH_STACKGROWTH}")
message("need_getline ${need_getline}")
@@
-64,23
+70,33
@@
if(enable_print_message)
message("HAVE_VSNPRINTF ${HAVE_VSNPRINTF}")
message("HAVE_ASPRINTF ${HAVE_ASPRINTF}")
message("HAVE_VASPRINTF ${HAVE_VASPRINTF}")
message("HAVE_VSNPRINTF ${HAVE_VSNPRINTF}")
message("HAVE_ASPRINTF ${HAVE_ASPRINTF}")
message("HAVE_VASPRINTF ${HAVE_VASPRINTF}")
+ message("HAVE_MMAP ${HAVE_MMAP}")
message("")
message("")
- message("RUBY.H : ${RUBY_INCLUDE_PATH}")
+ 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("")
+
message("JNI.H : ${JAVA_INCLUDE_PATH}")
message("JNI_MD.H : ${JAVA_INCLUDE_PATH2}")
message("JAVAC : ${JAVA_COMPILE}")
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("LUALIB.H: ${HAVE_LUA5_1_LUALIB_H}")
message("LAUXLIB.H: ${HAVE_LUA5_1_LAUXLIB_H}")
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}")
message("________________________________________________________________________________")
message("________________________________________________________________________________ DEBUG END")
message("")
endif(enable_print_message)
message("________________________________________________________________________________")
message("________________________________________________________________________________ DEBUG END")
message("")
endif(enable_print_message)
-message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}
${GIT_VERSION}
) on arch (=${GRAS_THISARCH}):")
+message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}) on arch (=${GRAS_THISARCH}):")
message(" BUILDNAME : ${BUILDNAME}")
message(" SITE : ${SITE}")
message(" BUILDNAME : ${BUILDNAME}")
message(" SITE : ${SITE}")
-message(" Release : simgrid-${
simgrid_version}~${SVN_VERSION}${GIT_DATE
}")
+message(" Release : simgrid-${
release_version}~rev${SVN_VERSION
}")
message("")
message(" Compiler: c++ : ${CMAKE_CXX_COMPILER}")
message(" version: ${COMPILER_CXX_VERSION}")
message("")
message(" Compiler: c++ : ${CMAKE_CXX_COMPILER}")
message(" version: ${COMPILER_CXX_VERSION}")
@@
-98,6
+114,7
@@
message(" Compile Java : ${HAVE_JAVA}")
message(" Compile Lua : ${HAVE_LUA}")
message(" Compile Ruby : ${HAVE_RUBY}")
message("")
message(" Compile Lua : ${HAVE_LUA}")
message(" Compile Ruby : ${HAVE_RUBY}")
message("")
+message(" Compile Smpi : ${enable_smpi}")
message(" Maintainer mode: ${enable_maintainer_mode}")
message(" Supernovae mode: ${enable_supernovae}")
message(" Tracing mode : ${enable_tracing}")
message(" Maintainer mode: ${enable_maintainer_mode}")
message(" Supernovae mode: ${enable_supernovae}")
message(" Tracing mode : ${enable_tracing}")