Add some test to cmake and correct bug in tesh file from commit 2010-02-04 21:47:02

[simgrid.git] / buildtools / CPACK / src / CMakeMakeExeLib.txt

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index c26dbc0..813d986 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -15,7 +15,7 @@ set(SIMGRID_DEP "")
 set(SMPI_DEP "")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-       add_definitions("-D_OPEN_SOURCE")
+       add_definitions("-D_XOPEN_SOURCE")
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 
@@ -43,9 +43,9 @@ endif(HAVE_GTNETS)
 #set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
 
 #add_definitions (-fprofile-arcs -ftest-coverage)
-target_link_libraries(simgrid ${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS}-fprofile-arcs)
-target_link_libraries(gras ${GRAS_DEP} -fprofile-arcs)
-target_link_libraries(smpi ${SMPI_DEP} -fprofile-arcs)
+target_link_libraries(simgrid  ${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS}-fprofile-arcs)
+target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(smpi     ${SMPI_DEP} -fprofile-arcs)
 
 ### Make EXEs
 
@@ -70,6 +70,8 @@ if(NOT init)
        add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)
        add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
        add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)
+       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main)
+       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep)
        add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag)
        add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network)
        add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p)
@@ -101,6 +103,7 @@ if(NOT init)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)
        if(HAVE_GTNETS)
+               add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
                add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)
        endif(HAVE_GTNETS)