Correction of a bug when make with gtnets.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7215 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 68d8c5d..aa6638f 100644 (file)
--- a/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt
+++ b/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt
@@ -5,7 +5,6 @@ set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 set(flags "-Dmain=smpi_simulated_main")
 set(INCLUDES_bis "-I${PROJECT_DIRECTORY}/include/smpi")
 
-set(CMAKE_C_FLAGS "")
 add_definitions (${INCLUDES_bis} ${flags})
 
 add_executable(alltoall2 alltoall2.c )

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index aaf17e9..71a48e7 100644 (file)
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -58,6 +58,7 @@ else(disable_gtnets)
        else(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 1)
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
+               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
        endif(COMPILE_GTNETS_VAR)
 endif(disable_gtnets)
 #message("HAVE_GTNETS ${HAVE_GTNETS}")