From: coldpeace <coldpeace@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 7 Apr 2010 08:57:24 +0000 (+0000)
Subject: Change cmake variable HAVE_RUBY_H to HAVE_RUBY for homogeneity with other variables
X-Git-Tag: SVN~284
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/323c04336e038c329cbbc35733fe7fa1333374f8?ds=sidebyside

Change cmake variable HAVE_RUBY_H to HAVE_RUBY for homogeneity with other variables

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

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 0a6b5df3c6..3b333b057f 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -53,7 +53,7 @@ CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
-SET(HAVE_RUBY_H 0)
+SET(HAVE_RUBY 0)
 set(libruby "ruby1.8")
 if(NOT disable_ruby)
 	include(FindRuby)
@@ -79,7 +79,7 @@ if(NOT disable_ruby)
 		
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_INCLUDE_PATH} -fPIC ")
 		ADD_DEFINITIONS("-I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
-		SET(HAVE_RUBY_H 1)
+		SET(HAVE_RUBY 1)
 	endif(RUBY_INCLUDE_PATH)
 endif(NOT disable_ruby)
 
diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 392f7722e9..2b03e390a0 100644
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -313,12 +313,12 @@ ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
 ${PROJECT_DIRECTORY}/src/.libs/libgras.*
 ${PROJECT_DIRECTORY}/src/.libs/libsmpi.*
 )
-if(HAVE_RUBY_H)
+if(HAVE_RUBY)
 	set(install_libs
 	${install_libs}
 	${PROJECT_DIRECTORY}/src/.libs/libsimgrid_ruby.*
 	)
-endif(HAVE_RUBY_H)
+endif(HAVE_RUBY)
 
 set(install_HEADERS
 ./include/gras.h 
@@ -517,17 +517,17 @@ else(${HAVE_JAVA})
 	)
 endif(${HAVE_JAVA})
 
-if(${HAVE_RUBY_H})
+if(${HAVE_RUBY})
 	set(simgrid_sources
 		${simgrid_sources}
 		${RUBY_SRC}
 	)
-else(${HAVE_RUBY_H})
+else(${HAVE_RUBY})
 	set(EXTRA_DIST
 		${EXTRA_DIST}
 		${RUBY_SRC}
 	)
-endif(${HAVE_RUBY_H})
+endif(${HAVE_RUBY})
 
 file(GLOB_RECURSE add_src_files
 "${PROJECT_DIRECTORY}/examples/*.c"
diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 0e9c39d5d7..060c256217 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -13,11 +13,11 @@ set(GRAS_DEP "pthread")
 set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
-if(HAVE_RUBY_H)
+if(HAVE_RUBY)
 	add_library(simgrid_ruby SHARED ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
 	set(RUBY_DEP "-lm -module")
 	target_link_libraries(simgrid_ruby 	simgrid ${RUBY_DEP} -fprofile-arcs)
-endif(HAVE_RUBY_H)
+endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	add_definitions("-D_XOPEN_SOURCE")
@@ -47,10 +47,10 @@ if(HAVE_POSIX_GETTIME)
 	SET(GRAS_DEP "${GRAS_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)
 
-if(NOT HAVE_RUBY_H)
+if(NOT HAVE_RUBY)
 	string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
 	string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
-endif(NOT HAVE_RUBY_H)
+endif(NOT HAVE_RUBY)
 
 target_link_libraries(simgrid 	${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(simgrid_static	${SIMGRID_DEP} -fprofile-arcs)
diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 53a90f3e88..34a2e00100 100644
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -96,7 +96,7 @@ message("	Compile Gtnets : 	${HAVE_GTNETS}")
 message("	Gtnets path    :	${gtnets_path}")
 message("	Compile Java   :   	${HAVE_JAVA}")
 message("	Compile Lua    :    	${HAVE_LUA}")
-message("	Compile Ruby   :    	${HAVE_RUBY_H}")
+message("	Compile Ruby   :    	${HAVE_RUBY}")
 message("")
 message("	Maintainer mode:	${enable_maintainer_mode}")
 message("	Supernovae mode:	${supernovae}")