Check if we are on a git-svn repository before running git svn info.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 7a8ae34..ce27f9a 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -149,9 +149,7 @@ if(enable_smpi)
                        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_F2C_H} ")
           endif(NOT operation)
        else(HAVE_F2C_H)
-               message("-- Smpi Need \"f2c.h\".")
-               message("-- Please install f2c before use smpi or set LD_LIBRARY_PATH to \"f2c.h\".")
-               message(FATAL_ERROR "SMPI DEPENDENCIES")
+               message("-- You should install f2c before use smpi.")
        endif(HAVE_F2C_H)       
 endif(enable_smpi)
 
@@ -379,20 +377,28 @@ if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 
        exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "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(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-       string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
        STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
        STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
        STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
-       foreach(line ${GIT_SVN_VERSION})
-               string(REGEX MATCH "^Revision:.*" line_good ${line})
-               if(line_good)
-                       string(REPLACE "Revision: " "" line_good ${line_good})
-                       set(SVN_VERSION ${line_good})
-               endif(line_good)
-       endforeach(line ${GIT_SVN_VERSION})
+
+       exec_program("git config --get svn-remote.svn.url"
+               OUTPUT_VARIABLE url
+               RETURN_VALUE ret)
+       if(ret EQUAL 0)
+               exec_program("git svn info" ${PROJECT_DIRECTORY}
+                       OUTPUT_VARIABLE "GIT_SVN_VERSION")
+               string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
+               foreach(line ${GIT_SVN_VERSION})
+                       string(REGEX MATCH "^Revision:.*" line_good ${line})
+                       if(line_good)
+                               string(REPLACE "Revision: " ""
+                                       line_good ${line_good})
+                               set(SVN_VERSION ${line_good})
+                       endif(line_good)
+               endforeach(line ${GIT_SVN_VERSION})
+       endif(ret EQUAL 0)
 endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 
 ###################################
@@ -758,6 +764,7 @@ set(libdir ${exec_prefix}/lib)
 set(CMAKE_LINKARGS "${CMAKE_CURRENT_BINARY_DIR}/lib")
 set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/lib:${gtnets_path}/lib:$LD_LIBRARY_PATH")
 
+configure_file(${PROJECT_DIRECTORY}/include/smpi/smpif.h.in ${PROJECT_DIRECTORY}/include/smpi/smpif.h @ONLY)
 configure_file(${PROJECT_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc @ONLY)
 configure_file(${PROJECT_DIRECTORY}/src/smpi/smpif2c.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpif2c @ONLY)
 configure_file(${PROJECT_DIRECTORY}/src/smpi/smpiff.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpiff @ONLY)