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
[tesh] sort things a bit and rename a function
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 7ab35ffa19ccf604024ee02ecbd129b1ae20e951..ae908c1899fdc33cad845cac7497b43accf54fbb 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-16,7
+16,10
@@
endif()
## Check the C/C++ standard that we need
## See also tools/cmake/Flags.cmake that sets our paranoid warning flags
if (MSVC)
## Check the C/C++ standard that we need
## See also tools/cmake/Flags.cmake that sets our paranoid warning flags
if (MSVC)
- message("-- MicroSoft Visual C detected. Good luck.")
+ message("-- You are compiling SimGrid with MicroSoft Visual C. Good luck.")
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_SCL_SECURE_NO_WARNINGS")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_SCL_SECURE_NO_WARNINGS")
else() # gcc or clang
INCLUDE(CheckCCompilerFlag)
CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER)
else() # gcc or clang
INCLUDE(CheckCCompilerFlag)
CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER)
@@
-173,7
+176,11
@@
endif()
### Check 32bits or 64bits
INCLUDE (CheckTypeSize)
### Check 32bits or 64bits
INCLUDE (CheckTypeSize)
+CHECK_TYPE_SIZE("int" SIZEOF_INT)
+CHECK_TYPE_SIZE("long" SIZEOF_LONG)
+CHECK_TYPE_SIZE("long long" SIZEOF_LONGLONG)
CHECK_TYPE_SIZE("void*" SIZEOF_VOIDSTAR)
CHECK_TYPE_SIZE("void*" SIZEOF_VOIDSTAR)
+message (" Data model: (int)=${SIZEOF_INT} (long)=${SIZEOF_LONG} (long long)=${SIZEOF_LONGLONG} (void*)=${SIZEOF_VOIDSTAR}")
IF(SIZEOF_VOIDSTAR EQUAL 4)
SET(ARCH_32_BITS 1)
ELSE()
IF(SIZEOF_VOIDSTAR EQUAL 4)
SET(ARCH_32_BITS 1)
ELSE()
@@
-272,9
+279,6
@@
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
### Setup the distrib
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake)
### Setup the distrib
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake)
-### Pipol compilation
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Pipol.cmake)
-
### Build the doc
if(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDoc.cmake)
### Build the doc
if(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDoc.cmake)