change the way unit testing is handled by cmake. Put it all in one file only instead...

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

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 2d2073d..90ced4c 100644 (file)
--- 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")
@@ -81,8 +84,7 @@ if(HAVE_LUA)
        )
 endif(HAVE_LUA)
 
-if(enable_graphviz AND HAVE_CDT_LIB)
-if(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
+if(HAVE_GRAPHVIZ)
 
     if(HAVE_CGRAPH_LIB)
            SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
@@ -92,8 +94,7 @@ if(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
         endif(HAVE_AGRAPH_LIB) 
     endif(HAVE_CGRAPH_LIB)
            
-endif(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
-endif(enable_graphviz AND HAVE_CDT_LIB)
+endif(HAVE_GRAPHVIZ)
 
 if(HAVE_GTNETS)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
@@ -124,9 +125,6 @@ endif(enable_lib_static)
 
 ### Make EXEs
 
-#src/testall
-add_subdirectory(${PROJECT_DIRECTORY}/src)
-
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
@@ -196,9 +194,9 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate)
 
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
-if(enable_graphviz)
-add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)
-endif(enable_graphviz)
+if(HAVE_GRAPHVIZ)
+  add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)
+endif(HAVE_GRAPHVIZ)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling)