From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 10 Feb 2010 17:28:56 +0000 (+0000)
Subject: fix smpi compile failed.
X-Git-Tag: SVN~655
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/97b213c80f90c737f925fc2d18aa92af588f6bd3

fix smpi compile failed.

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

diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt
index 58e8c2a561..9662c6c77e 100644
--- a/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt
+++ b/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt
@@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
+set(flags "-Dmain=smpi_simulated_main")
 set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include -I${PROJECT_DIRECTORY}/include/smpi")
 
 set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage)
-add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
+add_definitions (${INCLUDES} ${flags} -fprofile-arcs -ftest-coverage)
 
 add_executable(alltoall2 alltoall2.c )
 add_executable(alltoall_basic alltoall_basic.c)
diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index fdf99c5b08..3b95bed3e7 100644
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -110,7 +110,7 @@ if(NOT init)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
-	#add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
+	add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 	if(HAVE_JAVA)
 		message("Make : src/simgrid.jar with : ${JAVA_COMPILE}")