X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc5371bd904c096de593bd1e214c174bbc134e57..6e618a5ebc6d91c42e89143c6ff98d2ddb76e14a:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
old mode 100755
new mode 100644
index 642e48e2be..9019eaa3eb
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -240,9 +240,9 @@ set(SIMIX_SRC
 	src/simix/smx_deployment.c
 	src/simix/smx_environment.c
 	src/simix/smx_host.c
+	src/simix/smx_action.c
 	src/simix/smx_process.c
 	src/simix/smx_context.c
-	src/simix/smx_action.c
 	src/simix/smx_synchro.c
 	src/simix/smx_network.c
 	src/simix/smx_context_base.c
@@ -268,13 +268,12 @@ set(SIMDAG_SRC
 	src/simdag/sd_workstation.c
 	src/simdag/sd_daxloader.c
 )
-if(HAVE_CGRAPH_H)
-	set(SIMDAG_SRC
-		${SIMDAG_SRC}
+if(GRAPH_H OR AGRAPH_H OR CGRAPH_H)
+	set(SIMDAG_SRC 
+	    ${SIMDAG_SRC}
 		src/simdag/sd_dotloader.c
 	)
-
-endif(HAVE_CGRAPH_H)
+endif(GRAPH_H OR AGRAPH_H OR CGRAPH_H)
 
 set(GRAS_COMMON_SRC
 	src/gras/gras.c
@@ -414,7 +413,7 @@ include/gras/timer.h
 include/amok/peermanagement.h
 include/amok/bandwidth.h
 include/instr/instr.h
-include/simgrid_config.h
+${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
 include/gras.h 
 include/xbt.h
 )
@@ -749,10 +748,6 @@ set(bin_files
 tools/MSG_visualization/colorize.pl
 )
 
-file(GLOB_RECURSE doc_files
-"doc/html/*"
-)
-
 # This is the complete lise of what will be added to the source archive
 set(source_to_pack	
 	${XBT_RL_SRC}
@@ -783,5 +778,4 @@ set(source_to_pack
 	${EXTRA_DIST}
 	${CMAKE_SOURCE_FILES}
 	${bin_files}
-	${doc_files}
 )