Add all needs to include mc with cmake.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7717 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 512b1c9..7eba494 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -50,6 +50,7 @@ CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
 CHECK_FUNCTION_EXISTS(asprintf HAVE_ASPRINTF)
 CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
+CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 9b71765..8a75ac7 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -17,22 +17,24 @@ set(EXTRA_DIST
        ${PROJECT_DIRECTORY}/src/xbt/backtrace_windows.c
        ${PROJECT_DIRECTORY}/src/xbt/backtrace_dummy.c
        ${PROJECT_DIRECTORY}/src/xbt/setset_private.h
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/keys.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmalloc.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mm.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmprivate.h
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mrealloc.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/attach.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/detach.c   
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/keys.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mcalloc.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmcheck.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmstats.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mvalloc.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/detach.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mfree.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mm_legacy.c                
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mm.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmalloc.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmap-sup.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmcheck.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmemalign.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmprivate.h
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmstats.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmtrace.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/sbrk-sup.c  
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mrealloc.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mvalloc.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/sbrk-sup.c
+       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/test/mmalloc_test.c
        ${PROJECT_DIRECTORY}/src/surf/maxmin_private.h
        ${PROJECT_DIRECTORY}/src/surf/trace_mgr_private.h
        ${PROJECT_DIRECTORY}/src/surf/surf_private.h
@@ -57,6 +59,11 @@ set(EXTRA_DIST
        ${PROJECT_DIRECTORY}/src/include/xbt/wine_dbghelp.h
        ${PROJECT_DIRECTORY}/src/include/xbt/xbt_os_time.h
        ${PROJECT_DIRECTORY}/src/include/xbt/xbt_os_thread.h
+       ${PROJECT_DIRECTORY}/src/include/mc/datatypes.h
+       ${PROJECT_DIRECTORY}/src/include/mc/mc.h
+       ${PROJECT_DIRECTORY}/src/include/simix/simix.h
+       ${PROJECT_DIRECTORY}/src/include/simix/datatypes.h
+       ${PROJECT_DIRECTORY}/src/include/simix/context.h
        ${PROJECT_DIRECTORY}/src/msg/private.h
        ${PROJECT_DIRECTORY}/src/msg/mailbox.h
        ${PROJECT_DIRECTORY}/src/simdag/private.h
@@ -73,9 +80,6 @@ set(EXTRA_DIST
        ${PROJECT_DIRECTORY}/src/gras/Transport/transport_interface.h
        ${PROJECT_DIRECTORY}/src/amok/Bandwidth/bandwidth_private.h
        ${PROJECT_DIRECTORY}/src/amok/amok_modinter.h
-       ${PROJECT_DIRECTORY}/src/include/simix/simix.h
-       ${PROJECT_DIRECTORY}/src/include/simix/datatypes.h
-       ${PROJECT_DIRECTORY}/src/include/simix/context.h
        ${PROJECT_DIRECTORY}/src/simix/private.h
        ${PROJECT_DIRECTORY}/src/simix/smx_context_private.h
        ${PROJECT_DIRECTORY}/src/simix/smx_context_java.h
@@ -335,6 +339,7 @@ set(MC_SRC
        ${PROJECT_DIRECTORY}/src/mc/mc_dfs.c
        ${PROJECT_DIRECTORY}/src/mc/mc_dpor.c
        ${PROJECT_DIRECTORY}/src/mc/mc_transition.c
+       ${PROJECT_DIRECTORY}/src/mc/private.h
 )
 
 set(install_bins
@@ -391,7 +396,7 @@ set(install_HEADERS
 ./include/xbt/synchro_core.h
 ./include/xbt/queue.h
 ./include/xbt/setset.h
-./include/mmalloc.h
+./include/mc/modelchecker.h
 ./include/msg/msg.h
 ./include/msg/datatypes.h
 ./include/simdag/simdag.h
@@ -728,12 +733,14 @@ set(to_svg
        ${AMOK_SRC}
        ${LUA_SRC}
        ${RUBY_SRC}
+       ${MC_SRC}
        ${add_src_files}
        ${include_files}
        ${xml_files}
        ${tesh_files}
        ${txt_files}
        ${TEST_CFILES}
+       ${EXTRA_DIST} 
        ${PROJECT_DIRECTORY}/./CMakeLists.txt
        ${PROJECT_DIRECTORY}/./AUTHORS
        ${PROJECT_DIRECTORY}/./ChangeLog

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index fd36960..49af361 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -62,6 +62,7 @@ COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/html
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/xbt
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/mc
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/msg
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/simdag
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/smpi

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 393277b..69c2a9b 100644 (file)
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -67,6 +67,7 @@ if(enable_print_message)
        message("HAVE_VSNPRINTF                 ${HAVE_VSNPRINTF}")
        message("HAVE_ASPRINTF                  ${HAVE_ASPRINTF}")
        message("HAVE_VASPRINTF                 ${HAVE_VASPRINTF}")
+       message("HAVE_MMAP                      ${HAVE_MMAP}")
 
        message("")
        message("RUBY_EXE :                     ${RUBY_EXECUTABLE}")

diff --git a/buildtools/Cmake/src/c_gras_config.h.in b/buildtools/Cmake/src/c_gras_config.h.in
index 4334b7e..eb89437 100644 (file)
--- a/buildtools/Cmake/src/c_gras_config.h.in
+++ b/buildtools/Cmake/src/c_gras_config.h.in
@@ -69,6 +69,9 @@
 /* Define to 1 if you have the <execinfo.h> header file. */
 #cmakedefine HAVE_EXECINFO_H @HAVE_EXECINFO_H@
 
+/* Define to 1 if you have the `mmap' function. */
+#cmakedefine HAVE_MMAP @HAVE_MMAP@
+
 /* Define to 1 if you have the `getdtablesize' function. */
 #cmakedefine HAVE_GETDTABLESIZE @HAVE_GETDTABLESIZE@
 

diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt
index 59bbe93..db4e8d0 100644 (file)
--- a/examples/msg/mc/CMakeLists.txt
+++ b/examples/msg/mc/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/actions/")
+set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/mc/")
 
 add_executable(centralized centralized_mutex.c)
 add_executable(bugged1     bugged1.c)