From e94ee29b340453abdded4e762ba023ed73db42a8 Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 19 May 2010 16:08:45 +0000 Subject: [PATCH] Again for windows. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7775 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 6 ++--- buildtools/Cmake/src/CMakeCompleteInFiles.txt | 24 ++++++++++++------- buildtools/Cmake/src/CMakeOption.txt | 1 + buildtools/Cmake/src/CMakePrintArgs.txt | 9 ++++--- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cea929cfae..e87b427d6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,9 @@ if(WIN32) message("INCLUDE $ENV{INCLUDE}") message("LIB $ENV{LIB}") - if(NOT $ENV{CC} OR NOT $ENV{CXX} OR NOT $ENV{INCLUDE} OR NOT $ENV{RC} OR NOT $ENV{LIB}) - message(FATAL_ERROR "Need to set CC, CXX, RC, INCLUDE and LIB to environment variables.") - endif(NOT $ENV{CC} OR NOT $ENV{CXX} OR NOT $ENV{INCLUDE} OR NOT $ENV{RC} OR NOT $ENV{LIB}) + if(NOT EXISTS "$ENV{CC}.exe" OR NOT EXISTS "$ENV{CXX}.exe" OR OR NOT EXISTS "$ENV{RC}.exe" OR NOT EXISTS "$ENV{INCLUDE}" OR OR NOT EXISTS "$ENV{LIB}") + message(FATAL_ERROR "Need to set correctely CC, CXX, RC, INCLUDE and LIB environment variables.") + endif(NOT EXISTS "$ENV{CC}.exe" OR NOT EXISTS "$ENV{CXX}.exe" OR OR NOT EXISTS "$ENV{RC}.exe" OR NOT EXISTS "$ENV{INCLUDE}" OR OR NOT EXISTS "$ENV{LIB}") endif(WIN32) ### Find programs and paths diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt index 43ecd22a8d..12e13ed3a4 100644 --- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt +++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt @@ -260,13 +260,18 @@ try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c COMPILE_DEFINITIONS "${mcsc_flags}" ) -file(READ "${CMAKE_BINARY_DIR}/conftestval" mcsc) -STRING(REPLACE "\n" "" mcsc "${mcsc}") -if(mcsc) - set(mcsc "yes") -elseif(mcsc) + +if(EXISTS "${simgrid_BINARY_DIR}/conftestval") + file(READ "${simgrid_BINARY_DIR}/conftestval" mcsc) + STRING(REPLACE "\n" "" mcsc "${mcsc}") + if(mcsc) + set(mcsc "yes") + elseif(mcsc) + set(mcsc "no") + endif(mcsc) +else(EXISTS "${simgrid_BINARY_DIR}/conftestval") set(mcsc "no") -endif(mcsc) +endif(EXISTS "${simgrid_BINARY_DIR}/conftestval") if(mcsc MATCHES "no" AND pthread) if(HAVE_WINDOWS_H) @@ -342,7 +347,8 @@ endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) find_file(GIT ".git" ${PROJECT_DIRECTORY}) - exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION") + exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "GIT_VERSION") + string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}") exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE") exec_program("git svn info" ${PROJECT_DIRECTORY} OUTPUT_VARIABLE "GIT_SVN_VERSION") string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION}) @@ -472,7 +478,7 @@ if(HAVE_MAKECONTEXT) COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}" ) - file(READ ${CMAKE_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE) + file(READ ${simgrid_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE) string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}") string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}") string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}") @@ -491,7 +497,7 @@ endif(HAVE_MAKECONTEXT) ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_stackgrowth.c ) -file(READ "${CMAKE_BINARY_DIR}/conftestval" stack) +file(READ "${simgrid_BINARY_DIR}/conftestval" stack) if(stack MATCHES "down") set(PTH_STACKGROWTH "-1") endif(stack MATCHES "down") diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt index d1ccd82c71..59cc536f41 100644 --- a/buildtools/Cmake/src/CMakeOption.txt +++ b/buildtools/Cmake/src/CMakeOption.txt @@ -30,6 +30,7 @@ if(WIN32) #actually not enable with windows message("Mode supernovae and maintainer disable with Windows.") set(enable_supernovae false CACHE TYPE INTERNAL FORCE) set(enable_maintainer_mode false CACHE TYPE INTERNAL FORCE) + set(with_context "windows" CACHE TYPE INTERNAL FORCE) endif(WIN32) mark_as_advanced(enable_coverage) diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt index 40ffb66881..3e027f8d30 100644 --- a/buildtools/Cmake/src/CMakePrintArgs.txt +++ b/buildtools/Cmake/src/CMakePrintArgs.txt @@ -1,11 +1,14 @@ -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") - message("Simgrid_BINARY_DIR : ${Simgrid_BINARY_DIR}") + message("simgrid_BINARY_DIR : ${simgrid_BINARY_DIR}") message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}") message("") message("SIZEOF_MAX : ${SIZEOF_MAX}") -- 2.20.1