Fix SMPI on Mac.

[simgrid.git] / buildtools / Cmake / MakeExeLib.cmake

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 212e7fe..54e1388 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -1,8 +1,9 @@
 ### Make Libs
+include(FindSupernovae)
 
-if(enable_supernovae)
+if(enable_supernovae AND HAVE_SUPERNOVAE_TOOLS)
        include(${PROJECT_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
-else(enable_supernovae)        
+else(enable_supernovae AND HAVE_SUPERNOVAE_TOOLS)      
        add_library(simgrid SHARED ${simgrid_sources})
        add_library(gras SHARED ${gras_sources})
        if(enable_lib_static)
@@ -14,7 +15,7 @@ else(enable_supernovae)
                        add_library(smpi_static STATIC ${SMPI_SRC})     
                endif(enable_lib_static)
        endif(enable_smpi)
-endif(enable_supernovae)
+endif(enable_supernovae AND HAVE_SUPERNOVAE_TOOLS)
 
 set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
 set_target_properties(gras PROPERTIES VERSION ${libgras_version})
@@ -25,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")
@@ -57,7 +61,7 @@ if(pthread)
 endif(pthread)
 
 if(HAVE_LUA)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")   
+       SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${LIB_LUA_NAME}")   
          
     ADD_CUSTOM_TARGET(link_simgrid_lua ALL
       DEPENDS  simgrid