X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/663f424beab193b084453ba397102844dcd5ed64..11d3d193d6035bcf8c532d3852d86e10062c2622:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e40adb6f0f..4d1e64f3f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,21 +8,6 @@ set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")
 set(libsmpi_version "${release_version}")
 
-if(WIN32)
-	message("	Be sure all those variables are correctely set.")
-    message("		-- C_COMPILER			$ENV{CC}")
-    message("		-- CXX_COMPILER			$ENV{CXX}")    
-    message("		-- RC_COMPILER			$ENV{RC}")
-    message("		-- INCLUDE			$ENV{INCLUDE}")
-    message("		-- LIB				$ENV{LIB}")
-    message("		-- MAKE_PROGRAM			${CMAKE_MAKE_PROGRAM}")
-    message("		-- CMAKE_BUILD_TOOL			${CMAKE_BUILD_TOOL}")
-    message("		-- LINKER				${CMAKE_LINKER}")
-    message("		-- CMAKE_GENERATOR			${CMAKE_GENERATOR}\n\n")
-    set(__STRICT_ANSI__ 1)
-    set(_MSC_VER 1)
-endif(WIN32)
-
 ### Find programs and paths
 find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
 find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
@@ -31,24 +16,59 @@ find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
 SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
-#SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src") #this one is evil since it speaks to CPack instead
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/")
+set(INCLUDES "-I${PROJECT_DIRECTORY} -I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/")
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 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 "${INCLUDES} -I$ENV{INCLUDE}")
+	set(INCLUDES_MORE $ENV{INCLUDE})
+	string(REPLACE "\\" "/" INCLUDES_MORE "${INCLUDES_MORE}")
+	foreach(include_dir ${INCLUDES_MORE})
+		set(INCLUDES "${INCLUDES} -I\"${include_dir}\"")
+	endforeach(include_dir ${INCLUDES_MORE})
+	message("Be sure all those variables are correctely set.")
+    message("	-- C_COMPILER			$ENV{CC}")
+    message("	-- CXX_COMPILER			$ENV{CXX}")    
+    message("	-- RC_COMPILER			$ENV{RC}")
+    message("	-- INCLUDE			$ENV{INCLUDE}")
+    message("	-- LIB				$ENV{LIB}")
+    message("	-- MAKE_PROGRAM			${CMAKE_MAKE_PROGRAM}")
+    message("	-- CMAKE_BUILD_TOOL		${CMAKE_BUILD_TOOL}")
+    message("	-- LINKER			${CMAKE_LINKER}")
+    message("	-- CMAKE_GENERATOR		${CMAKE_GENERATOR}")
+    message("	-- INCLUDES			${INCLUDES}\n\n")
+    set(__STRICT_ANSI__ 1)
+    set(_MSC_VER 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)
@@ -59,13 +79,32 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/CompleteInFiles.cmake)
 ### Define source packages for Libs 
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake)
 
+### Build some Maintainer files
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
 
 ### Setup gcc flags
 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
+	  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/index.html)
+endif(enable_doc)
 
 ### Make Simgrid.jar and Java examples
 if(HAVE_JAVA)