From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 25 Nov 2010 14:25:55 +0000 (+0000)
Subject: Fix SMPI on Mac.
X-Git-Tag: v3_5~180
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/13c7dd6bd326b1ed430e25df68981671441963ac?ds=sidebyside

Fix SMPI on Mac.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8650 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 2d2073d036..54e1388c95 100644
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -26,6 +26,9 @@ endif(enable_smpi)
 set(GRAS_DEP "-lm -lpthread")
 set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
+if(APPLE)
+    set(SMPI_DEP "-Wl,-U -Wl,_smpi_simulated_main")
+endif(APPLE)
 
 if(HAVE_PCRE_LIB)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre")
diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index d049b09c73..340ac7590c 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -51,16 +51,6 @@ option(enable_lib_static "" off)
 option(enable_graphviz "" off)
 option(GRAS_IS_BROKEN "Set some tests are broken" off)
 
-if(WIN32 OR APPLE) #actually not enable with windows and Apple
-	message("-- Smpi and GTnets are disabled.")
-	set(enable_smpi false CACHE TYPE INTERNAL FORCE)
-	set(enable_gtnets false CACHE TYPE INTERNAL FORCE) 
-    mark_as_advanced(enable_smpi)
-    mark_as_advanced(enable_gtnets)
-    mark_as_advanced(gtnets_path)
-endif(WIN32 OR APPLE)
-
-
 if(enable_supernovae AND enable_model-checking)
 	set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
 	message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 3c91cfd694..a6fc1d427c 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -188,9 +188,7 @@ endif(NOT APPLE AND NOT WIN32)
 message("	Compile Java   :   	${HAVE_JAVA}")
 message("	Compile Lua    :    	${HAVE_LUA}")
 message("	Compile Ruby   :    	${HAVE_RUBY}")
-if(NOT APPLE AND NOT WIN32)
 message("	Compile Smpi   :    	${enable_smpi}")
-endif(NOT APPLE AND NOT WIN32)
 message("	Compile Static :    	${enable_lib_static}")
 message("")
 message("	Maintainer mode:	${enable_maintainer_mode}")