From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 2 Mar 2010 14:45:44 +0000 (+0000)
Subject: Add flags for ruby when enable_ruby.
X-Git-Tag: SVN~571
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/66c1b7030c35c15410e04b3382e8ecb051df1d27?ds=sidebyside

Add flags for ruby when enable_ruby.

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

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index 84350ffd3b..67da361424 100644
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -5,18 +5,16 @@ include(CheckLibraryExists)
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
 SET(HAVE_RUBY_H 0)
-if(NOT disable_ruby)
-	SET(RUBY_PATH "non")
-	find_program(FIND_EXE NAMES find)
-	exec_program("${FIND_EXE} /usr/lib -name ruby.h" OUTPUT_VARIABLE RUBY_PATH)
-	string(REPLACE "/ruby.h" "/" RUBY_PATH ${RUBY_PATH})
-	message("RUBY_PATH ${RUBY_PATH}")
-	if(RUBY_PATH)
-	SET(HAVE_RUBY_H 1)
+SET(RUBY_PATH "non")
+find_program(FIND_EXE NAMES find)
+exec_program("${FIND_EXE} /usr/lib -name ruby.h" OUTPUT_VARIABLE RUBY_PATH)
+string(REPLACE "/ruby.h" "/" RUBY_PATH ${RUBY_PATH})
+#message("RUBY_PATH ${RUBY_PATH}")
+
+if(NOT disable_ruby AND RUBY_PATH)
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC ")
-	#add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC")
-	endif(RUBY_PATH)
-endif(NOT disable_ruby)
+	SET(HAVE_RUBY_H 1)
+endif(NOT disable_ruby AND RUBY_PATH)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA