From: navarrop Date: Fri, 2 Jul 2010 12:14:52 +0000 (+0000) Subject: Add path for cgraph by default ou by user. X-Git-Tag: v3_5~855 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/097a9ccab1a8e09d007ceb2a72d00bb399b8864d?hp=df7b4f1f292b74f35d1f4f958128642739a5dd42 Add path for cgraph by default ou by user. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7962 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 479b997c3f..196c6b15da 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -2,9 +2,8 @@ include(CheckFunctionExists) include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckLibraryExists) -if(APPLE) -set( CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} /opt/local/include") -endif(APPLE) + +set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} ${CGRPAH_PATH}") # Checks for header libraries functions. @@ -16,29 +15,30 @@ CHECK_LIBRARY_EXISTS(rt clock_gettime NO_DEFAULT_PATHS HAVE_POSIX_GETTIME) CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME) CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS) -CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H) -CHECK_INCLUDE_FILE(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H) -CHECK_INCLUDE_FILE(socket.h HAVE_SOCKET_H) -CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H) -CHECK_INCLUDE_FILE(stat.h HAVE_STAT_H) -CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H) -CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) -CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H) -CHECK_INCLUDE_FILE(winsock2.h HAVE_WINSOCK2_H) -CHECK_INCLUDE_FILE(errno.h HAVE_ERRNO_H) -CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H) -CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H) -CHECK_INCLUDE_FILE(signal.h HAVE_SIGNAL_H) -CHECK_INCLUDE_FILE(sys/time.h HAVE_SYS_TIME_H) -CHECK_INCLUDE_FILE(time.h HAVE_TIME_H) -CHECK_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H) -CHECK_INCLUDE_FILE(memory.h HAVE_MEMORY_H) -CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H) -CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H) -CHECK_INCLUDE_FILE(string.h HAVE_STRING_H) -CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) -CHECK_INCLUDE_FILE(graphviz/cgraph.h HAVE_CGRAPH_H) +CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H) +CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_VALGRIND_H) +CHECK_INCLUDE_FILE("socket.h" HAVE_SOCKET_H) +CHECK_INCLUDE_FILE("sys/socket.h" HAVE_SYS_SOCKET_H) +CHECK_INCLUDE_FILE("stat.h" HAVE_STAT_H) +CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) +CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H) +CHECK_INCLUDE_FILE("winsock.h" HAVE_WINSOCK_H) +CHECK_INCLUDE_FILE("winsock2.h" HAVE_WINSOCK2_H) +CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) +CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) +CHECK_INCLUDE_FILE("execinfo.h" HAVE_EXECINFO_H) +CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H) +CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H) +CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H) +CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) +CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) +CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) +CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H) +CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H) +CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H) +CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H) +CHECK_INCLUDE_FILE("graphviz/cgraph.h" HAVE_CGRAPH_H) + CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP) CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE) @@ -201,6 +201,13 @@ if(enable_java) endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) endif(enable_java) +#-------------------------------------------------------------------------------------------------- +### Initialize of cgraph + +if(HAVE_CGRAPH_H) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${CGRPAH_PATH} ") +endif(HAVE_CGRAPH_H) + #-------------------------------------------------------------------------------------------------- ### Initialize of CONTEXT GTNETS if(NOT enable_gtnets OR enable_supernovae) diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index b6cfbf7e32..ebdcadeffc 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -1,6 +1,12 @@ ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see after) ### ex: cmake -Denable_java=ON -Denable_gtnets=ON ./ +if(APPLE AND NOT CGRPAH_PATH) + set(CGRPAH_PATH "/opt/local/include/graphviz" CACHE PATH "Path to cgraph.h") +else(APPLE AND NOT CGRPAH_PATH) + set(CGRPAH_PATH "/usr/include/graphviz" CACHE PATH "Path to cgraph.h") +endif(APPLE AND NOT CGRPAH_PATH) + set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html") set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib") set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag") @@ -50,7 +56,7 @@ endif(enable_supernovae AND enable_model-checking) mark_as_advanced(enable_coverage) mark_as_advanced(enable_memcheck) -mark_as_advanced(enable_print_message) +#mark_as_advanced(enable_print_message) mark_as_advanced(BIBTEX2HTML_PATH) mark_as_advanced(LUA_LIB_PATH_1) mark_as_advanced(LUA_LIB_PATH_2) diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake index 27429e0635..440370515c 100644 --- a/buildtools/Cmake/PrintArgs.cmake +++ b/buildtools/Cmake/PrintArgs.cmake @@ -70,6 +70,7 @@ if(enable_print_message) message("HAVE_STDLIB_H ${HAVE_STDLIB_H}") message("HAVE_STRINGS_H ${HAVE_STRINGS_H}") message("HAVE_STRING_H ${HAVE_STRING_H}") + message("HAVE_CGRAPH_H ${HAVE_CGRAPH_H}") message("") message("HAVE_GETTIMEOFDAY ${HAVE_GETTIMEOFDAY}") @@ -166,7 +167,6 @@ message(" Gras dependencies : ${GRAS_DEP}") message(" Smpi dependencies : ${SMPI_DEP}") message("") message(" INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") -message("") exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI) file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build "SVN version : ${SVN_VERSION}\n")