supernovae was missing sd_dotloader because of we were using old macro names in CMake

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
old mode 100755 (executable)
new mode 100644 (file)
index 2c03455..8e4a66e
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -105,6 +105,7 @@ set(SMPI_SRC
        src/smpi/smpi_bench.c
        src/smpi/smpi_global.c
        src/smpi/smpi_mpi.c
+       src/smpi/smpi_f77.c
        src/smpi/smpi_comm.c
        src/smpi/smpi_group.c
        src/smpi/smpi_util.c
@@ -240,9 +241,9 @@ set(SIMIX_SRC
        src/simix/smx_deployment.c
        src/simix/smx_environment.c
        src/simix/smx_host.c
+       src/simix/smx_action.c
        src/simix/smx_process.c
        src/simix/smx_context.c
-       src/simix/smx_action.c
        src/simix/smx_synchro.c
        src/simix/smx_network.c
        src/simix/smx_context_base.c
@@ -268,13 +269,14 @@ set(SIMDAG_SRC
        src/simdag/sd_workstation.c
        src/simdag/sd_daxloader.c
 )
-if(HAVE_CGRAPH_H)
-       set(SIMDAG_SRC
-               ${SIMDAG_SRC}
+if(enable_graphviz AND HAVE_CDT_LIB)
+if(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
+       set(SIMDAG_SRC 
+           ${SIMDAG_SRC}
                src/simdag/sd_dotloader.c
        )
-
-endif(HAVE_CGRAPH_H)
+endif(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
+endif(enable_graphviz AND HAVE_CDT_LIB)
 
 set(GRAS_COMMON_SRC
        src/gras/gras.c
@@ -319,9 +321,9 @@ set(AMOK_SRC
 )
 
 set(LUA_SRC
-       src/simix/smx_context_lua.c
        src/bindings/lua/simgrid_lua.c
        src/bindings/lua/lua_stub_generator.c
+       src/bindings/lua/lua_console.c
 )
 
 set(TRACING_SRC
@@ -336,6 +338,7 @@ set(TRACING_SRC
        src/instr/smx_instr.c
        src/instr/surf_instr.c
        src/instr/smpi_instr.c
+       src/instr/sd_instr.c
        src/instr/variables_instr.c
        src/instr/resource_utilization.c
        src/instr/private.h
@@ -398,7 +401,9 @@ include/msg/datatypes.h
 include/simdag/simdag.h
 include/simdag/datatypes.h
 include/smpi/smpi.h
+include/smpi/smpif.h
 include/smpi/mpi.h
+include/smpi/mpif.h
 include/surf/surfxml_parse.h
 include/surf/simgrid_dtd.h
 include/gras/datadesc.h
@@ -412,7 +417,7 @@ include/gras/timer.h
 include/amok/peermanagement.h
 include/amok/bandwidth.h
 include/instr/instr.h
-include/simgrid_config.h
+${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
 include/gras.h 
 include/xbt.h
 )
@@ -612,6 +617,8 @@ file(GLOB_RECURSE add_src_files
 set(add_src_files
        ${add_src_files}
        src/smpi/smpicc.in
+       src/smpi/smpif2c.in
+       src/smpi/smpiff.in
        src/smpi/smpirun.in
        src/simix/smx_context_sysv_private.h
        src/simgrid_units_main.c
@@ -745,10 +752,8 @@ file(GLOB_RECURSE CMAKE_SOURCE_FILES
 
 set(bin_files
 tools/MSG_visualization/colorize.pl
-)
-
-file(GLOB_RECURSE doc_files
-"doc/html/*"
+tools/sg_unit_extractor.pl
+tools/simgrid_update_xml.pl
 )
 
 # This is the complete lise of what will be added to the source archive
@@ -781,5 +786,4 @@ set(source_to_pack
        ${EXTRA_DIST}
        ${CMAKE_SOURCE_FILES}
        ${bin_files}
-       ${doc_files}
 )