X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41aeab983aed4105a2868c9339cf1c8df5f35724..960d34134e4221c5ec5506e69ba21fd725743c5a:/CMakeLists.txt?ds=sidebyside

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66ccec4589..246eb5a37a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,15 @@ if(EXISTS /usr/include/)
 	set(INCLUDES "${INCLUDES} -I/usr/include/")
 endif(EXISTS /usr/include/)
 
+### Check 32bits or 64bits
+INCLUDE (CheckTypeSize)
+CHECK_TYPE_SIZE("long" SIZEOF_LONG)
+IF(SIZEOF_LONG EQUAL 4)
+  SET(ARCH_32_BITS 1)
+ELSE(SIZEOF_LONG EQUAL 4)
+  SET(ARCH_32_BITS 0)
+ENDIF(SIZEOF_LONG EQUAL 4)
+
 if(WIN32)
 	set(INCLUDES_MORE $ENV{INCLUDE})
 	string(REPLACE "\\" "/" INCLUDES_MORE "${INCLUDES_MORE}")
@@ -43,14 +52,23 @@ if(WIN32)
     message("	-- INCLUDES			${INCLUDES}\n\n")
     set(__STRICT_ANSI__ 1)
     set(_MSC_VER 1)
-    set(_WIN32 1)
+    set(_XBT_WIN32 1)
+    if(BORLAND)			### BORLAND COMPILER
+	    set(__BORLANDC__ 1)
+	    set(_XBT_BORLANDC_COMPILER 1)
+    endif(BORLAND)
+    if(MSVC_VERSION)	### MicroSoftVisualC COMPILER
+	    set(__VISUALC__ 1)
+	    set(_XBT_VISUALC_COMPILER 1)
+    endif(MSVC_VERSION)  
+    if(ARCH_32_BITS)	### Arch 32bits
+    	set(_WIN32 1)
+    else(ARCH_32_BITS)	### Arch 64bits
+    	set(_WIN64 1)
+    endif(ARCH_32_BITS)
 endif(WIN32)
 
-if(enable_coverage)
-	add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
-else(enable_coverage)
-	add_definitions (${INCLUDES})
-endif(enable_coverage)
+add_definitions (${INCLUDES})
 
 ### Setup Options
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/Option.cmake)
@@ -68,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
@@ -81,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