X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/47a6b2b4bbfa3f2acb62c6a0a48569f3b5194f15..e7773f764a1b85fcb0b25dc466b95c1ac9375085:/buildtools/Cmake/CompleteInFiles.cmake diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 4e916724e1..6f04bc5eaa 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -7,9 +7,7 @@ include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckLibraryExists) include(TestBigEndian) -if(enable_graphviz) include(FindGraphviz) -endif(enable_graphviz) TEST_BIG_ENDIAN(BIGENDIAN) # Checks for header libraries functions. @@ -151,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) @@ -199,62 +195,6 @@ else(NOT enable_gtnets OR enable_supernovae) endif(NOT enable_gtnets OR enable_supernovae) #-------------------------------------------------------------------------------------------------- -### Initialize of cgraph -if(enable_graphviz AND HAVE_CDT_LIB) -if(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB) - - if(HAVE_AGRAPH_LIB) - string(REGEX REPLACE "/libagraph.*" "" lib_graphviz ${HAVE_AGRAPH_LIB}) - else(HAVE_AGRAPH_LIB) - if(HAVE_CGRAPH_LIB) - string(REGEX REPLACE "/libcgraph.*" "" lib_graphviz ${HAVE_CGRAPH_LIB}) - endif(HAVE_CGRAPH_LIB) - endif(HAVE_AGRAPH_LIB) - - if(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H) - - if(HAVE_GRAPH_H) - string(REPLACE "/graphviz/graph.h" "" file_graphviz_h ${HAVE_GRAPH_H}) - string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h}) - set(GRAPH_H 1) - endif(HAVE_GRAPH_H) - - if(HAVE_AGRAPH_H) - string(REPLACE "/graphviz/agraph.h" "" file_graphviz_h ${HAVE_AGRAPH_H}) - string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h}) - set(AGRAPH_H 1) - endif(HAVE_AGRAPH_H) - - if(HAVE_CGRAPH_H) - string(REPLACE "/graphviz/cgraph.h" "" file_graphviz_h ${HAVE_CGRAPH_H}) - string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h}) - set(CGRAPH_H 1) - endif(HAVE_CGRAPH_H) - - string(REGEX MATCH "-I${file_graphviz_h} " operation "${CMAKE_C_FLAGS}") - if(NOT operation) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_graphviz_h} ") - endif(NOT operation) - - string(REGEX MATCH "-I${file_graphviz_h}/graphviz " operation "${CMAKE_C_FLAGS}") - if(NOT operation) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_graphviz_h}/graphviz ") - endif(NOT operation) - - string(REGEX MATCH "-L${lib_graphviz} " operation "${CMAKE_C_FLAGS}") - if(NOT operation) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${lib_graphviz} ") - endif(NOT operation) - - else(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H) - set(enable_graphviz "0") - endif(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H) - -else(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB) - set(enable_graphviz "0") -endif(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB) - -endif(enable_graphviz AND HAVE_CDT_LIB) #-------------------------------------------------------------------------------------------------- ### Initialize of pcre find_library(PATH_PCRE_LIB pcre) @@ -559,16 +499,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 @@ -582,7 +521,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) #-------------------------------------------------------------------------------------------------- @@ -810,13 +749,14 @@ configure_file("${PROJECT_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_CUR set(top_srcdir "${PROJECT_DIRECTORY}") set(srcdir "${PROJECT_DIRECTORY}/src") -set(exec_prefix ${prefix}) -set(includedir ${prefix}/include) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(includedir ${CMAKE_INSTALL_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}/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)