X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa9d8bfe2bf176fa6b86b7db4acbbaff8ee85292..565726e9628c350bdfba6de6cc1c917732f7f04d:/buildtools/Cmake/UnitTesting.cmake

diff --git a/buildtools/Cmake/UnitTesting.cmake b/buildtools/Cmake/UnitTesting.cmake
index 152a2bb5bd..e5f12bd0f7 100644
--- a/buildtools/Cmake/UnitTesting.cmake
+++ b/buildtools/Cmake/UnitTesting.cmake
@@ -13,6 +13,7 @@ set(TEST_CFILES
 	src/xbt/xbt_sha.c
 	src/xbt/config.c
 	src/xbt/xbt_synchro.c
+	src/xbt/parmap.c
 )
 set(TEST_UNITS
 	${CMAKE_CURRENT_BINARY_DIR}/src/cunit_unit.c
@@ -26,43 +27,29 @@ set(TEST_UNITS
 	${CMAKE_CURRENT_BINARY_DIR}/src/xbt_sha_unit.c
 	${CMAKE_CURRENT_BINARY_DIR}/src/config_unit.c
 	${CMAKE_CURRENT_BINARY_DIR}/src/xbt_synchro_unit.c
+	${CMAKE_CURRENT_BINARY_DIR}/src/parmap_unit.c
 	
 	${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_units_main.c
 )
 
 
 
-if(PERL_EXECUTABLE)
-	
-	ADD_CUSTOM_COMMAND(
-	  	OUTPUT	${TEST_UNITS}
-			
-  		DEPENDS	${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl
-			${TEST_CFILES}
-  	
-		COMMAND	${CMAKE_COMMAND} -E remove -f ${TEST_UNITS}
-	
-		COMMAND chmod +x ${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl
-	
-		COMMAND ${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl --root=src/ --outdir=${CMAKE_CURRENT_BINARY_DIR}/src/ ${TEST_CFILES}
-	
-		WORKING_DIRECTORY ${PROJECT_DIRECTORY}
-	
-	        COMMENT "Generating *_units files for testall..."
-	)
-	
-	
-else(PERL_EXECUTABLE)
-	ADD_CUSTOM_COMMAND(
+ADD_CUSTOM_COMMAND(
   	OUTPUT	${TEST_UNITS}
-			
-  	DEPENDS	${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl
-  		${TEST_CFILES}
-			
-	COMMAND	${CMAKE_COMMAND} message WARNING "Unit files need to be regenerated, but no Perl installed")
-endif(PERL_EXECUTABLE)
+		
+	DEPENDS	${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl
+		${TEST_CFILES}
+
+	COMMAND	${CMAKE_COMMAND} -E remove -f ${TEST_UNITS}
+
+	COMMAND chmod +x ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl
 
+	COMMAND ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl --root=src/ --outdir=${CMAKE_CURRENT_BINARY_DIR}/src/ ${TEST_CFILES}
 
+	WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+
+        COMMENT "Generating *_units files for testall..."
+)
 
 
 ### Ensure the build of testall
@@ -79,4 +66,4 @@ else(NOT WIN32)
     target_link_libraries(testall gras)
 endif(NOT WIN32)
 	
-add_dependencies(testall $(TEST_UNITS))
\ No newline at end of file
+add_dependencies(testall ${TEST_UNITS})
\ No newline at end of file