Gtnets flags.

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

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index 97d60f2..efd6b85 100644 (file)
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -42,19 +42,15 @@ if(disable_gtnets)
        SET(HAVE_GTNETS 0)
 else(disable_gtnets)
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
        SET(HAVE_GTNETS 0)
 else(disable_gtnets)
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)

-       set(GTNETS_LDFLAGS "-lgtnets -L${gtnets_path}/lib")
+       set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")

        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")

-       exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp" OUTPUT_VARIABLE COMPILE_GTNETS_VAR)      
+       exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp" OUTPUT_VARIABLE COMPILE_GTNETS_VAR)     

        if(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 0)
                message("GTnetS doesn't works : set -Ddisable_gtnets=on")
        else(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 1)
        if(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 0)
                message("GTnetS doesn't works : set -Ddisable_gtnets=on")
        else(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 1)

-               set(INCLUDES
-                       ${INCLUDES}
-                       ${GTNETS_CPPFLAGS}
-               )
-               add_definitions(${GTNETS_LDFLAGS})
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ")

        endif(COMPILE_GTNETS_VAR)
 endif(disable_gtnets)
 #message("HAVE_GTNETS ${HAVE_GTNETS}")
        endif(COMPILE_GTNETS_VAR)
 endif(disable_gtnets)
 #message("HAVE_GTNETS ${HAVE_GTNETS}")