From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 7 Jul 2010 11:26:22 +0000 (+0000)
Subject: Cosmetics.
X-Git-Tag: v3_5~820
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8bd46825a44ab8fc38deb0cdd21ae6a0cde2f1a7

Cosmetics.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 50b56fcc32..6448080c4f 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -227,15 +227,15 @@ mark_as_advanced(HAVE_CGRAPH_LIB)
 mark_as_advanced(HAVE_CGRAPH_H)
 
 if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
-	string(REGEX REPLACE "libcgraph.*" "" lib_cgraph ${HAVE_CGRAPH_LIB})
-	string(REPLACE "graphviz/cgraph.h" "" file_cgraph_h ${HAVE_CGRAPH_H})
+	string(REGEX REPLACE "/libcgraph.*" "" lib_cgraph ${HAVE_CGRAPH_LIB})
+	string(REPLACE "/cgraph.h" "" file_cgraph_h ${HAVE_CGRAPH_H})
 	
-	string(REGEX MATCH "-L${lib_cgraph}" operation "${CMAKE_EXE_LINKER_FLAGS}")
+	string(REGEX MATCH "-L${lib_cgraph} " operation "${CMAKE_EXE_LINKER_FLAGS}")
 	if(NOT operation)
 		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}-L${lib_cgraph} ")
 	endif(NOT operation)
 	
-	string(REGEX MATCH "-I${file_cgraph_h}" operation "${CMAKE_C_FLAGS}")
+	string(REGEX MATCH "-I${file_cgraph_h} " operation "${CMAKE_C_FLAGS}")
 	if(NOT operation)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_cgraph_h} ")
 	endif(NOT operation)
@@ -732,8 +732,8 @@ SET( CMAKEDEFINE "#cmakedefine" )
 configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/gras_config.h.in" 	"${PROJECT_DIRECTORY}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file("${PROJECT_DIRECTORY}/src/gras_config.h" 				"${PROJECT_DIRECTORY}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file("${PROJECT_DIRECTORY}/include/simgrid_config.h.in" 			"${PROJECT_DIRECTORY}/include/simgrid_config.h" @ONLY IMMEDIATE)
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/tracing_config.h.in" 	"${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
-configure_file("${PROJECT_DIRECTORY}/include/instr/tracing_config.h" 		"${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
+#configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/tracing_config.h.in" 	"${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
+#configure_file("${PROJECT_DIRECTORY}/include/instr/tracing_config.h" 		"${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
 set(top_srcdir "${PROJECT_DIRECTORY}")
 set(srcdir "${PROJECT_DIRECTORY}/src")
diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 0d71ff5322..b7e9f03170 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -130,7 +130,7 @@ if(enable_print_message)
 	message("PERL : 				${PERL_EXE}")
 	endif(enable_maintainer_mode)
 	message("")
-	message("libcgraph :		${HAVE_CGRAPH_LIB}")
+	message("libcgraph :			${HAVE_CGRAPH_LIB}")
 	message("cgraph.h :			${HAVE_CGRAPH_H}")
 	message("________________________________________________________________________________")
 	message("________________________________________________________________________________ DEBUG END")