Merge tracing_config.h into simgrid_config.h, where it belongs

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb72ca5..246eb5a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,12 +86,16 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/Flags.cmake)
 
 ### Make Libs and Exes
+if(WIN32)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLibWin.cmake)
+else(WIN32)
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake)
+endif(WIN32)
 
 ### Build the doc
 if(enable_doc)
        ADD_CUSTOM_COMMAND(
-         OUTPUT ${PROJECT_DIRECTORY}/doc/html/index.html
+         OUTPUT ${PROJECT_DIRECTORY}/doc/html
          DEPENDS       ${PROJECT_DIRECTORY}/doc/FAQ.doc 
                                ${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake 
                                ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeLists.txt
@@ -99,7 +103,7 @@ if(enable_doc)
          COMMENT "Generating the simgrid documentation..."
        )
        ADD_CUSTOM_TARGET(simgrid_documentation ALL
-                         DEPENDS ${PROJECT_DIRECTORY}/doc/html/index.html)
+                         DEPENDS ${PROJECT_DIRECTORY}/doc/html)
 endif(enable_doc)
 
 ### Make Simgrid.jar and Java examples