From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 28 Jun 2010 09:49:08 +0000 (+0000)
Subject: Add dependancies for libraries and testall.
X-Git-Tag: v3_5~873
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e14e11a710ba64989953c40e5e46905650c172f1

Add dependancies for libraries and testall.

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

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index d1a1bce916..4c420429d1 100644
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -104,8 +104,6 @@ else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 
 if(PERL_EXE)
-	string(REPLACE "src/" "" USE_TEST_CFILES "${TEST_CFILES}")
-	string(REPLACE ";" " " USE_TEST_CFILES "${USE_TEST_CFILES}")
 	
 	ADD_CUSTOM_COMMAND(
   	OUTPUT	${PROJECT_DIRECTORY}/src/cunit_unit.c
@@ -169,43 +167,23 @@ if(PERL_EXE)
 	COMMENT "Generating *_units files for testall..."
 	)
 	
+	add_custom_target(units_files
+						DEPENDS ${PROJECT_DIRECTORY}/src/cunit_unit.c
+								${PROJECT_DIRECTORY}/src/ex_unit.c
+								${PROJECT_DIRECTORY}/src/dynar_unit.c
+								${PROJECT_DIRECTORY}/src/dict_unit.c
+								${PROJECT_DIRECTORY}/src/set_unit.c
+								${PROJECT_DIRECTORY}/src/swag_unit.c
+								${PROJECT_DIRECTORY}/src/xbt_str_unit.c
+								${PROJECT_DIRECTORY}/src/xbt_strbuff_unit.c
+								${PROJECT_DIRECTORY}/src/xbt_sha_unit.c
+								${PROJECT_DIRECTORY}/src/config_unit.c
+								${PROJECT_DIRECTORY}/src/xbt_synchro_unit.c
+						)
+	
 else(PERL_EXE)
 	message(FATAL_ERROR "Install perl before use maintainer mode")
 endif(PERL_EXE)
 
-if(PERL_EXE)
-	set(DEPENDS_FILES 
-			${DEPENDS_FILES}
-			${PROJECT_DIRECTORY}/src/cunit_unit.c
-			${PROJECT_DIRECTORY}/src/ex_unit.c
-			${PROJECT_DIRECTORY}/src/dynar_unit.c
-			${PROJECT_DIRECTORY}/src/dict_unit.c
-			${PROJECT_DIRECTORY}/src/set_unit.c
-			${PROJECT_DIRECTORY}/src/swag_unit.c
-			${PROJECT_DIRECTORY}/src/xbt_str_unit.c
-			${PROJECT_DIRECTORY}/src/xbt_strbuff_unit.c
-			${PROJECT_DIRECTORY}/src/xbt_sha_unit.c
-			${PROJECT_DIRECTORY}/src/config_unit.c
-			${PROJECT_DIRECTORY}/src/xbt_synchro_unit.c	
-		)
-endif(PERL_EXE)
-if(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
-	set(DEPENDS_FILES 
-			${DEPENDS_FILES}
-			${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h
-  			${PROJECT_DIRECTORY}/include/xbt/graphxml.h
-  			${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h
-  			${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c
-  			${PROJECT_DIRECTORY}/src/xbt/graphxml.c
-  			${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c
-		)
-endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
-
-if(DEPENDS_FILES)
-add_custom_target(_maintainer_files ALL
-					DEPENDS ${DEPENDS_FILES}
-					)
-endif(DEPENDS_FILES)
-
 endif(enable_maintainer_mode AND NOT WIN32)
 
diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index d39ebc27fb..9b966848c3 100644
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -3,9 +3,9 @@
 if(enable_supernovae)
 	include(${PROJECT_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
 else(enable_supernovae)	
-	add_library(simgrid SHARED ${simgrid_sources})
-	add_library(simgrid_static STATIC ${simgrid_sources})
-	add_library(gras SHARED ${gras_sources})
+	add_library(simgrid SHARED ${simgrid_sources} ${PROJECT_DIRECTORY}/include/xbt/graphxml.h)
+	add_library(simgrid_static STATIC ${simgrid_sources} ${PROJECT_DIRECTORY}/include/xbt/graphxml.h)
+	add_library(gras SHARED ${gras_sources} ${PROJECT_DIRECTORY}/include/xbt/graphxml.h)
 	if(enable_smpi)
 		add_library(smpi SHARED ${SMPI_SRC})
 	endif(enable_smpi)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89d9af4588..d6db69dd5d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,3 +13,5 @@ add_executable(testall ${USE_TEST_UNITS})
 
 ### Add definitions for compile
 target_link_libraries(testall gras m)
+
+add_dependencies(testall units_files)
\ No newline at end of file