Remove further references to gras in buildtools/.

diff --git a/buildtools/Cmake/GenerateDocWin.cmake b/buildtools/Cmake/GenerateDocWin.cmake
index 7283e59..a7bc518 100644 (file)
--- a/buildtools/Cmake/GenerateDocWin.cmake
+++ b/buildtools/Cmake/GenerateDocWin.cmake
@@ -16,7 +16,7 @@ endif()
 if(NSIS_PATH)
   ADD_CUSTOM_TARGET(nsis
     COMMENT "Generating the SimGrid installor for Windows..."
-    DEPENDS simgrid simgrid gras graphicator tesh simgrid-colorizer simgrid_update_xml
+    DEPENDS simgrid simgrid graphicator tesh simgrid-colorizer simgrid_update_xml
     COMMAND ${NSIS_PATH}/makensis.exe simgrid.nsi
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
     )

diff --git a/buildtools/Cmake/GenerateRefGuide.cmake b/buildtools/Cmake/GenerateRefGuide.cmake
index 6e136fc..9eb270f 100644 (file)
--- a/buildtools/Cmake/GenerateRefGuide.cmake
+++ b/buildtools/Cmake/GenerateRefGuide.cmake
@@ -1,7 +1,6 @@
 #### Generate the html documentation
 
 file(GLOB_RECURSE source_doxygen
-  "${CMAKE_HOME_DIRECTORY}/tools/gras/*.[chl]"
   "${CMAKE_HOME_DIRECTORY}/src/*.[chl]"
   "${CMAKE_HOME_DIRECTORY}/include/*.[chl]"
   )

diff --git a/buildtools/Cmake/GenerateUserGuide.cmake b/buildtools/Cmake/GenerateUserGuide.cmake
index a4f0526..41b792b 100644 (file)
--- a/buildtools/Cmake/GenerateUserGuide.cmake
+++ b/buildtools/Cmake/GenerateUserGuide.cmake
@@ -1,7 +1,6 @@
 #### Generate the html documentation for the user guide.
 
 file(GLOB_RECURSE source_doxygen
-  "${CMAKE_HOME_DIRECTORY}/tools/gras/*.[chl]"
   "${CMAKE_HOME_DIRECTORY}/src/*.[chl]"
   "${CMAKE_HOME_DIRECTORY}/include/*.[chl]"
   )

diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake
index cb29b3d..a8794ba 100644 (file)
--- a/buildtools/Cmake/MakeLibWin.cmake
+++ b/buildtools/Cmake/MakeLibWin.cmake
@@ -1,9 +1,7 @@
 ### Make Libs
 #>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
 add_library(simgrid SHARED ${simgrid_sources})
-add_library(gras SHARED ${gras_sources})
 
-set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version}    OUTPUT_NAME "gras")
 set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")
 
 if(enable_smpi)
@@ -28,7 +26,6 @@ else()
     )
 endif()
 
-set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")
 set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")
 set(SMPI_DEP "${LIBRARY_OUTPUT_PATH}/libsimgrid.dll")
 
@@ -39,7 +36,6 @@ else()
   #        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
 endif()
 
-target_link_libraries(gras     ${GRAS_DEP})
 target_link_libraries(simgrid  ${SIMGRID_DEP})
 if(enable_smpi)
 add_dependencies(smpi simgrid)

diff --git a/buildtools/Cmake/Modules/FindSimGrid.cmake b/buildtools/Cmake/Modules/FindSimGrid.cmake
index 67994c7..c8a6234 100644 (file)
--- a/buildtools/Cmake/Modules/FindSimGrid.cmake
+++ b/buildtools/Cmake/Modules/FindSimGrid.cmake
@@ -1,5 +1,5 @@
 #IF YOU HAVE INSTALL SIMGRID IN A SPECIAL DIRECTORY
-#YOU CAN SPECIFY SIMGRID_ROOT OR GRAS_ROOT
+#YOU CAN SPECIFY SIMGRID_ROOT
 
 # TO CALL THIS FILE USE
 #set(CMAKE_MODULE_PATH
@@ -11,7 +11,6 @@ find_library(HAVE_SIMGRID_LIB
   NAME simgrid
   HINTS
   $ENV{LD_LIBRARY_PATH}
-  $ENV{GRAS_ROOT}
   $ENV{SIMGRID_ROOT}
   PATH_SUFFIXES lib64 lib
   PATHS
@@ -22,37 +21,9 @@ find_library(HAVE_SIMGRID_LIB
   /usr
   )
 
-find_path(HAVE_GRAS_H gras.h
-  HINTS
-  $ENV{GRAS_ROOT}
-  $ENV{SIMGRID_ROOT}
-  PATH_SUFFIXES include
-  PATHS
-  /opt
-  /opt/local
-  /opt/csw
-  /sw
-  /usr
-  )
-
 find_program(HAVE_TESH
   NAMES tesh
   HINTS
-  $ENV{GRAS_ROOT}
-  $ENV{SIMGRID_ROOT}
-  PATH_SUFFIXES bin
-  PATHS
-  /opt
-  /opt/local
-  /opt/csw
-  /sw
-  /usr
-  )
-
-find_program(HAVE_GRAS_STUB
-  NAMES gras_stub_generator
-  HINTS
-  $ENV{GRAS_ROOT}
   $ENV{SIMGRID_ROOT}
   PATH_SUFFIXES bin
   PATHS
@@ -78,17 +49,6 @@ else()
   message(STATUS "Looking for lib SimGrid - not found")
 endif()
 
-message(STATUS "Looking for gras.h")
-if(HAVE_GRAS_H)
-  message(STATUS "Looking for gras.h - found")
-else()
-  message(STATUS "Looking for gras.h - not found")
-endif()
-
 if(HAVE_TESH)
   message(STATUS "Found Tesh: ${HAVE_TESH}")
 endif()
-
-if(HAVE_GRAS_STUB)
-  message(STATUS "Found gras_stub_generator: ${HAVE_GRAS_STUB}")
-endif()
\ No newline at end of file