Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Change cmake variable HAVE_RUBY_H to HAVE_RUBY for homogeneity with other variables
authorcoldpeace <coldpeace@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 7 Apr 2010 08:57:24 +0000 (08:57 +0000)
committercoldpeace <coldpeace@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 7 Apr 2010 08:57:24 +0000 (08:57 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7456 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/Cmake/src/CMakeCompleteInFiles.txt
buildtools/Cmake/src/CMakeDefinePackages.txt
buildtools/Cmake/src/CMakeMakeExeLib.txt
buildtools/Cmake/src/CMakePrintArgs.txt

index 0a6b5df..3b333b0 100644 (file)
@@ -53,7 +53,7 @@ CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
 
 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)
 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(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)
 
        endif(RUBY_INCLUDE_PATH)
 endif(NOT disable_ruby)
 
index 392f772..2b03e39 100644 (file)
@@ -313,12 +313,12 @@ ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
 ${PROJECT_DIRECTORY}/src/.libs/libgras.*
 ${PROJECT_DIRECTORY}/src/.libs/libsmpi.*
 )
 ${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.*
        )
        set(install_libs
        ${install_libs}
        ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_ruby.*
        )
-endif(HAVE_RUBY_H)
+endif(HAVE_RUBY)
 
 set(install_HEADERS
 ./include/gras.h 
 
 set(install_HEADERS
 ./include/gras.h 
@@ -517,17 +517,17 @@ else(${HAVE_JAVA})
        )
 endif(${HAVE_JAVA})
 
        )
 endif(${HAVE_JAVA})
 
-if(${HAVE_RUBY_H})
+if(${HAVE_RUBY})
        set(simgrid_sources
                ${simgrid_sources}
                ${RUBY_SRC}
        )
        set(simgrid_sources
                ${simgrid_sources}
                ${RUBY_SRC}
        )
-else(${HAVE_RUBY_H})
+else(${HAVE_RUBY})
        set(EXTRA_DIST
                ${EXTRA_DIST}
                ${RUBY_SRC}
        )
        set(EXTRA_DIST
                ${EXTRA_DIST}
                ${RUBY_SRC}
        )
-endif(${HAVE_RUBY_H})
+endif(${HAVE_RUBY})
 
 file(GLOB_RECURSE add_src_files
 "${PROJECT_DIRECTORY}/examples/*.c"
 
 file(GLOB_RECURSE add_src_files
 "${PROJECT_DIRECTORY}/examples/*.c"
index 0e9c39d..060c256 100644 (file)
@@ -13,11 +13,11 @@ set(GRAS_DEP "pthread")
 set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
 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)
        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")
 
 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)
 
        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})
        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)
 
 target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(simgrid_static   ${SIMGRID_DEP} -fprofile-arcs)
index 53a90f3..34a2e00 100644 (file)
@@ -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("      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}")
 message("")
 message("      Maintainer mode:        ${enable_maintainer_mode}")
 message("      Supernovae mode:        ${supernovae}")