Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
supernovae was missing sd_dotloader because of we were using old macro names in CMake
[simgrid.git] / buildtools / Cmake / DefinePackages.cmake
old mode 100755 (executable)
new mode 100644 (file)
index 067538c..8e4a66e
@@ -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,11 +321,14 @@ 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
+       src/instr/instr_config.c
+       src/instr/categories.c
        src/instr/interface.c
        src/instr/general.c
        src/instr/paje.c
@@ -332,7 +337,10 @@ set(TRACING_SRC
        src/instr/msg_volume.c
        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
 )
 
@@ -393,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
@@ -407,8 +417,7 @@ include/gras/timer.h
 include/amok/peermanagement.h
 include/amok/bandwidth.h
 include/instr/instr.h
-include/instr/tracing_config.h
-include/simgrid_config.h
+${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
 include/gras.h 
 include/xbt.h
 )
@@ -443,7 +452,7 @@ src/xbt/xbt_synchro.c
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS
-if(${CONTEXT_THREADS} OR WIN32)
+if(${CONTEXT_THREADS}) #pthread
        set(SURF_SRC
                ${SURF_SRC}
                src/xbt/xbt_os_thread.c
@@ -453,17 +462,27 @@ if(${CONTEXT_THREADS} OR WIN32)
                ${EXTRA_DIST}
                src/simix/smx_context_sysv.c
        )
-else(${CONTEXT_THREADS} OR WIN32)
+else(${CONTEXT_THREADS}) #ucontext
        set(SURF_SRC
                ${SURF_SRC}
                src/simix/smx_context_sysv.c
        )
-       set(EXTRA_DIST
-               ${EXTRA_DIST}
-               src/xbt/xbt_os_thread.c
-               src/simix/smx_context_thread.c
-       )
-endif(${CONTEXT_THREADS} OR WIN32)
+
+       if(WIN32)
+       set(SURF_SRC
+               ${SURF_SRC}
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c)
+    else(WIN32)
+       set(EXTRA_DIST
+               ${EXTRA_DIST}
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c)
+    endif(WIN32)
+endif(${CONTEXT_THREADS})
+
+
+
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)
@@ -551,23 +570,6 @@ else(${HAVE_RUBY})
        )
 endif(${HAVE_RUBY})
 
-file(GLOB_RECURSE add_src_files
-"examples/*.c"
-"teshsuite/*.c"
-"testsuite/*.c"
-"tools/*.c"
-"examples/*.cxx"
-"teshsuite/*.cxx"
-"testsuite/*.cxx"
-"tools/*.cxx"
-"examples/*CMakeLists.txt"
-"teshsuite/*CMakeLists.txt"
-"testsuite/*CMakeLists.txt"
-"tools/*CMakeLists.txt"
-"src/*CMakeLists.txt"
-"examples/*.java"
-)
-
 file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.c"
 "examples/*.h"
@@ -594,6 +596,44 @@ foreach(file ${new_examples_to_install_in_doc})
        endif(NOT OPERATION)
 endforeach(file ${new_examples_to_install_in_doc})
 
+file(GLOB_RECURSE add_src_files
+"teshsuite/*.c"
+"teshsuite/*.cxx"
+"testsuite/*.c"
+"testsuite/*.cxx"
+"tools/*.c"
+"tools/*.cxx"
+"examples/*.c"
+"examples/*.cxx"
+"examples/*.java"
+"examples/*.lua"
+"examples/*.rb"
+"src/bindings/*.lua"
+"src/bindings/*.rb"
+"src/bindings/*.c"
+"src/bindings/*.h"
+"*CMakeLists.txt"
+)
+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
+       src/cunit_unit.c
+       src/ex_unit.c
+       src/dynar_unit.c
+       src/dict_unit.c
+       src/set_unit.c
+       src/swag_unit.c
+       src/xbt_str_unit.c
+       src/xbt_strbuff_unit.c
+       src/xbt_sha_unit.c
+       src/config_unit.c
+       src/xbt_synchro_unit.c
+)
 
 file(GLOB_RECURSE include_files
 "include/*.h"
@@ -605,7 +645,6 @@ file(GLOB_RECURSE include_files
 "src/*.h.in"
 "include/*.h.in"
 )
-#message("\n\ninclude:\n${include_files}")
 
 file(GLOB_RECURSE xml_files
 "examples/*.xml"
@@ -615,7 +654,6 @@ file(GLOB_RECURSE xml_files
 "testsuite/*.xml"
 "tools/*.xml"
 )
-#message("\n\nxml:\n${xml_files}")
 
 file(GLOB_RECURSE tesh_files
 "examples/*.tesh"
@@ -625,7 +663,6 @@ file(GLOB_RECURSE tesh_files
 "testsuite/*.tesh"
 "tools/*.tesh"
 )
-#message("\n\ntesh:\n${tesh_files}")
 
 file(GLOB_RECURSE txt_files
 "testsuite/surf/trace*.txt"
@@ -689,8 +726,35 @@ file(GLOB_RECURSE txt_files
 "examples/java/comm_time/CommTimeTest"
 "examples/java/suspend/SuspendTest"
 )
+set(txt_files
+       ${txt_files}
+       AUTHORS
+       ChangeLog
+       COPYING
+       missing
+       NEWS
+       README
+       README.IEEE
+       TODO
+       examples/lua/README
+       examples/ruby/README
+)
 
+file(GLOB_RECURSE CMAKE_SOURCE_FILES
+"buildtools/Cmake/test_java.sh"
+"buildtools/Cmake/*.cmake"
+"buildtools/Cmake/*.h.in"
+"buildtools/Cmake/*.pl"
+"buildtools/Cmake/*.sh"
+"buildtools/Cmake/test_prog/*.c"
+"buildtools/Cmake/test_prog/*.cpp"
+)
 
+set(bin_files
+tools/MSG_visualization/colorize.pl
+tools/sg_unit_extractor.pl
+tools/simgrid_update_xml.pl
+)
 
 # This is the complete lise of what will be added to the source archive
 set(source_to_pack     
@@ -720,83 +784,6 @@ set(source_to_pack
        ${txt_files}
        ${TEST_CFILES}
        ${EXTRA_DIST}
-       CMakeLists.txt
-       buildtools/Cmake/CTestConfig.cmake
-       buildtools/Cmake/CompleteInFiles.cmake
-       buildtools/Cmake/DefinePackages.cmake
-       buildtools/Cmake/Distrib.cmake
-       buildtools/Cmake/GenerateDoc.cmake
-       buildtools/Cmake/Flags.cmake
-       buildtools/Cmake/MakeJava.cmake
-       buildtools/Cmake/MaintainerMode.cmake
-       buildtools/Cmake/MakeExeLib.cmake
-       buildtools/Cmake/Option.cmake
-       buildtools/Cmake/PrintArgs.cmake
-       buildtools/Cmake/Supernovae.cmake
-       buildtools/Cmake/AddTests.cmake
-       buildtools/Cmake/memcheck_tests.cmake
-       buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
-       buildtools/Cmake/test_prog/prog_getline.c
-       buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
-       buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
-       buildtools/Cmake/test_prog/prog_gtnets.cpp
-       buildtools/Cmake/test_prog/prog_max_size.c
-       buildtools/Cmake/test_prog/prog_mutex_timedlock.c
-       buildtools/Cmake/test_prog/prog_printf_null.c
-       buildtools/Cmake/test_prog/prog_sem_init.c
-       buildtools/Cmake/test_prog/prog_sem_timedwait.c
-       buildtools/Cmake/test_prog/prog_snprintf.c
-       buildtools/Cmake/test_prog/prog_stackgrowth.c
-       buildtools/Cmake/test_prog/prog_stacksetup.c
-       buildtools/Cmake/test_prog/prog_va_copy.c
-       buildtools/Cmake/test_prog/prog_vsnprintf.c
-       buildtools/Cmake/gras_config.h.in
-       buildtools/Cmake/tracing_config.h.in
-       AUTHORS
-       ChangeLog
-       COPYING
-       missing
-       NEWS
-       README
-       README.IEEE
-       TODO
-       src/smpi/smpicc.in
-       src/smpi/smpirun.in
-       src/bindings/ruby/simgrid_ruby.c
-       src/bindings/ruby_bindings.h
-       src/simix/smx_context_sysv_private.h
-       src/simgrid_units_main.c
-       src/cunit_unit.c
-       src/ex_unit.c
-       src/dynar_unit.c
-       src/dict_unit.c
-       src/set_unit.c
-       src/swag_unit.c
-       src/xbt_str_unit.c
-       src/xbt_strbuff_unit.c
-       src/xbt_sha_unit.c
-       src/config_unit.c
-       src/xbt_synchro_unit.c
-       src/bindings/lua/master_slave.lua
-       src/bindings/lua/mult_matrix.lua
-       examples/lua/master_slave.lua
-       examples/lua/mult_matrix.lua
-       examples/lua/README
-       src/bindings/ruby/MasterSlave.rb
-       src/bindings/ruby/MasterSlaveData.rb
-       src/bindings/ruby/PingPong.rb
-       src/bindings/ruby/Quicksort.rb
-       src/bindings/ruby/simgrid.rb
-       examples/ruby/README
-       examples/ruby/MasterSlave.rb
-       examples/ruby/PingPong.rb
-       examples/ruby/Quicksort.rb
-       src/bindings/rubyDag/example.rb
-       src/bindings/rubyDag/extconfig.rb
-       src/bindings/rubyDag/rb_SD_task.c
-       src/bindings/rubyDag/rb_SD_task.h
-       src/bindings/rubyDag/rb_SD_workstation.c
-       src/bindings/rubyDag/rb_SD_workstation.h
-       src/bindings/rubyDag/rb_simdag.c
-       src/bindings/rubyDag/simdag.rb
+       ${CMAKE_SOURCE_FILES}
+       ${bin_files}
 )