Correct Name of test.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 7d9d66b..bd2c1a4 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -98,19 +98,11 @@ else(enable_model-checking AND HAVE_MMAP)
 endif(enable_model-checking AND HAVE_MMAP)
 
 if(enable_lua)
-       include(FindLua51)
+       include(FindLua51Simgrid)
        if(LUA51_FOUND)
                set(HAVE_LUA 1)
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${LUA_INCLUDE_DIR} ")
-               foreach(path_lua ${LUA_LIBRARIES})
-               string(REGEX REPLACE "liblua.*" "" path_lua_to_use ${path_lua})
-               string(REGEX MATCH ".*lua.*" operation "${path_lua}")
-               if(operation)
-                       string(REGEX REPLACE "${path_lua_to_use}" "" liblua ${path_lua})
-                       string(REPLACE "lib" "" liblua "${liblua}")
-                       string(REGEX REPLACE "[.][^.]*$" "" liblua "${liblua}")                 
-               endif(operation)
-               endforeach(path_lua ${LUA_LIBRARIES})
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${LUA_LIBRARY_DIR} ")
        else(LUA51_FOUND)
                message("Lua binding need version 5.1 and cmake version 2.8")
                message("Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
@@ -148,6 +140,23 @@ if(enable_ruby)
        
 endif(enable_ruby)
 
+#--------------------------------------------------------------------------------------------------
+### Initialize of Smpi
+
+if(enable_smpi)
+       include(FindF2c)
+       if(HAVE_F2C_H)
+       string(REGEX MATCH "-I${HAVE_F2C_H} " operation "${CMAKE_C_FLAGS}")
+          if(NOT operation)
+                       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")
+       endif(HAVE_F2C_H)       
+endif(enable_smpi)
+
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
 
@@ -550,16 +559,15 @@ if(HAVE_MAKECONTEXT OR WIN32)
                set(makecontext_CPPFLAGS_2 "-DOSX")
        endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        
-    if(WIN32)
-        if(__VISUALC__)
-            set(makecontext_CPPFLAGS "/DTEST_makecontext")
-           set(makecontext_CPPFLAGS_2 "/D_XBT_WIN32 /I${PROJECT_DIRECTORY}/include/xbt /I${PROJECT_DIRECTORY}/src/xbt")
-       endif(__VISUALC__)
-       if(__GNUC__)
-           set(makecontext_CPPFLAGS "-DTEST_makecontext")
-           set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt")
-       endif(__GNUC__)
-    else(WIN32)
+    if(WIN32 AND __VISUALC__)
+        set(makecontext_CPPFLAGS "/DTEST_makecontext")
+           set(makecontext_CPPFLAGS_2 "/D_XBT_WIN32 /I${PROJECT_DIRECTORY}/include/xbt /I${PROJECT_DIRECTORY}/src/xbt")
+       endif(WIN32 AND __VISUALC__)
+       if(WIN32 AND __GNUC__)
+           set(makecontext_CPPFLAGS "-DTEST_makecontext")
+           set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt")
+       endif(WIN32 AND __GNUC__)
+       
        try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
                ${simgrid_BINARY_DIR}
                ${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
@@ -573,7 +581,7 @@ if(HAVE_MAKECONTEXT OR WIN32)
        string(REPLACE "," "" makecontext_size "${MAKECONTEXT_SIZE}")   
        set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
        set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
-    endif(WIN32)
+       
 endif(HAVE_MAKECONTEXT OR WIN32)
 
 #--------------------------------------------------------------------------------------------------
@@ -809,10 +817,14 @@ 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}/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)
 configure_file(${PROJECT_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpirun @ONLY)
 configure_file(${PROJECT_DIRECTORY}/examples/smpi/hostfile ${CMAKE_CURRENT_BINARY_DIR}/examples/smpi/hostfile COPYONLY)
 configure_file(${PROJECT_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_CURRENT_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY)
 configure_file(${PROJECT_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_CURRENT_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
 
 exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE OKITOKI)
+exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITOKI)
+exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI)
 exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI)