From 1055bda9e0ceab0f8f185ac2ddf1c3c956fe59df Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 2 Mar 2010 10:11:56 +0000 Subject: [PATCH] Commit for Cdash test. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7164 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/CPACK/src/CMakeCompleteInFiles.txt | 2 +- buildtools/CPACK/src/CMakeMakeExeLib.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt index efd6b85e2c..ee3fd34725 100644 --- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt +++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt @@ -50,7 +50,7 @@ else(disable_gtnets) message("GTnetS doesn't works : set -Ddisable_gtnets=on") else(COMPILE_GTNETS_VAR) SET(HAVE_GTNETS 1) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS}") endif(COMPILE_GTNETS_VAR) endif(disable_gtnets) #message("HAVE_GTNETS ${HAVE_GTNETS}") diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt index 1b6b35728e..8e173fb793 100644 --- a/buildtools/CPACK/src/CMakeMakeExeLib.txt +++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt @@ -9,7 +9,9 @@ else(supernovae) endif(supernovae) set(GRAS_DEP "pthread") -set(SIMGRID_DEP "ruby1.8") +if(HAVE_RUBY_H) + set(SIMGRID_DEP "ruby1.8") +endif(HAVE_RUBY_H) set(SMPI_DEP "") if(CMAKE_SYSTEM_NAME MATCHES "Darwin") -- 2.20.1