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 git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
buildtools
/
Cmake
/
MakeLibWin.cmake
diff --git
a/buildtools/Cmake/MakeLibWin.cmake
b/buildtools/Cmake/MakeLibWin.cmake
index
f596b1f
..
3699a3a
100644
(file)
--- a/
buildtools/Cmake/MakeLibWin.cmake
+++ b/
buildtools/Cmake/MakeLibWin.cmake
@@
-29,10
+29,13
@@
endif()
set(SIMGRID_DEP "-lws2_32 -L${PATH_PTHREAD_LIB} -lm -lpthreadGC2")
set(SIMGRID_DEP "-lws2_32 -L${PATH_PTHREAD_LIB} -lm -lpthreadGC2")
+
if(ARCH_32_BITS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
if(ARCH_32_BITS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -march=i486")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
# message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
endif()
# message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
endif()