Fix memory errors in gras_os_myname.

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da7ee4c..63df508 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,7 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake)
 
 ### Build some Maintainer files
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/UnitTesting.cmake)
 
 ### Setup gcc flags
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/Flags.cmake)
@@ -147,16 +148,7 @@ endif(WIN32)
 
 ### Build the doc
 if(enable_doc)
-       ADD_CUSTOM_COMMAND(
-         OUTPUT ${PROJECT_DIRECTORY}/doc/html
-         DEPENDS       ${PROJECT_DIRECTORY}/doc/FAQ.doc 
-                               ${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake 
-                               ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeLists.txt
-         COMMAND ${CMAKE_MAKE_PROGRAM} html
-         COMMENT "Generating the simgrid documentation..."
-       )
-       ADD_CUSTOM_TARGET(simgrid_documentation ALL
-                         DEPENDS ${PROJECT_DIRECTORY}/doc/html)
+       include(${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
 endif(enable_doc)
 
 ### Make Simgrid.jar and Java examples