X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d80d762d5f337406c0bf863af8cfb19ab83085a..e688bbc5142fbfae83a2c436d5e72dcc9754a473:/buildtools/Cmake/CompleteInFiles.cmake?ds=sidebyside diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index e97750e3b9..84fe86f374 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -88,11 +88,11 @@ if(enable_lua) foreach(path_lua ${LUA_LIBRARIES}) string(REGEX REPLACE "liblua.*" "" path_lua_to_use ${path_lua}) string(REGEX MATCH ".*lua.*" operation "${path_lua}") - if(NOT operation) + if(operation) string(REGEX REPLACE "${path_lua_to_use}" "" liblua ${path_lua}) string(REPLACE "lib" "" liblua "${liblua}") string(REGEX REPLACE "[.][^.]*$" "" liblua "${liblua}") - endif(NOT operation) + endif(operation) endforeach(path_lua ${LUA_LIBRARIES}) else(LUA51_FOUND) message("Lua binding need version 5.1 and cmake version 2.8") @@ -711,6 +711,7 @@ set(includedir ${prefix}/include) set(top_builddir ${PROJECT_DIRECTORY}) 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}/src/smpi/smpicc.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc @ONLY) configure_file(${PROJECT_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpirun @ONLY)