X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7eef625065d0b3af4a64b5665009491426db974f..6c78a73b09f4c01d837cacfe249bd18a3ce95e02:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb72ca5f77..19fb40dd6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,8 @@ set(libgras_version "${release_version}")
 set(libsmpi_version "${release_version}")
 
 ### Find programs and paths
-find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
-find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
+FIND_PROGRAM(GCOV_PATH gcov)
+FIND_PROGRAM(VALGRIND_PATH valgrind)
 
 ### SET THE PROJECT_DIRECTORY
 SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
@@ -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
@@ -114,6 +118,9 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 ### Setup the distrib
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 
+### Pipol compilation
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
+
 ### Print ARGS
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)