A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
db45e7e
..
54b68d1
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-3,7
+3,8
@@
cmake_minimum_required(VERSION 2.6)
if(WIN32)
SET(CMAKE_RC_COMPILER "windres")
endif(WIN32)
if(WIN32)
SET(CMAKE_RC_COMPILER "windres")
endif(WIN32)
-project(simgrid CXX C)
+project(SimGrid CXX C)
+
set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
@@
-13,10
+14,11
@@
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
# 3.5.9{1,2} -> beta{1,2}
# 3.5.9{3,4,5} -> rc{1,2,3}
# 3.6.{0,1,2} -> release 3.6, 3.6.1, 3.6.2
# 3.5.9{1,2} -> beta{1,2}
# 3.5.9{3,4,5} -> rc{1,2,3}
# 3.6.{0,1,2} -> release 3.6, 3.6.1, 3.6.2
+# 3.7.0
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "
6
")
-set(SIMGRID_VERSION_PATCH "
2
")
+set(SIMGRID_VERSION_MINOR "
7
")
+set(SIMGRID_VERSION_PATCH "
0
")
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
@@
-134,24
+136,7
@@
if(WIN32)
string(REGEX REPLACE "/bin/gcc.*" "/include" CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
string(REGEX REPLACE "/bin/gcc.*" "/lib" CMAKE_LIB_WIN "${CMAKE_LIB_WIN}")
set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN})
string(REGEX REPLACE "/bin/gcc.*" "/include" CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
string(REGEX REPLACE "/bin/gcc.*" "/lib" CMAKE_LIB_WIN "${CMAKE_LIB_WIN}")
set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN})
-
- if(BORLAND) ### BORLAND COMPILER
- set(__BORLANDC__ 1)
- set(CMAKE_COMPILER_IS_GNUCC 0)
- set(MSVC 0)
- set(_XBT_BORLANDC_COMPILER 1)
- endif(BORLAND)
-
- if(MSVC) ### MicroSoftVisualC COMPILER
- set(__VISUALC__ 1)
- set(BORLAND 0)
- set(CMAKE_COMPILER_IS_GNUCC 0)
- set(_XBT_VISUALC_COMPILER 1)
- set(_MSC_VER 1)
- set(__STRICT_ANSI__ 1)
- set(_M_IX86 1)
- endif(MSVC)
-
+
if(CMAKE_COMPILER_IS_GNUCC)
set(__GNUC__ 1)
exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
if(CMAKE_COMPILER_IS_GNUCC)
set(__GNUC__ 1)
exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
@@
-167,6
+152,8
@@
if(WIN32)
endif(COMPILER_C_MINOR_VERSION)
set(MSVC 0)
set(BORLAND 0)
endif(COMPILER_C_MINOR_VERSION)
set(MSVC 0)
set(BORLAND 0)
+ else(CMAKE_COMPILER_IS_GNUCC)
+ message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
endif(CMAKE_COMPILER_IS_GNUCC)
if(ARCH_32_BITS) ### Arch 32bits
endif(CMAKE_COMPILER_IS_GNUCC)
if(ARCH_32_BITS) ### Arch 32bits
@@
-239,10
+226,13
@@
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
### Pipol compilation
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
### Pipol compilation
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
-if(NOT WIN32)
### Build the doc
### Build the doc
+if(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
+else(NOT WIN32)
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)
endif(NOT WIN32)
endif(NOT WIN32)
+
### Print ARGS
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
### Print ARGS
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)