X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7721f9d25945759e012f67181e69550a3a222eb0..12a3d01e7de3d8fdefa0aeedeb0cee96936567f0:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 3e6b61e5d8..ed0ef3191e 100755 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -195,9 +195,15 @@ set(XBT_SRC src/xbt/cunit.c src/xbt/graphxml_parse.c src/xbt/setset.c - src/xbt/mmalloc/mm.c ) +if(HAVE_MMAP) + set(XBT_SRC + ${XBT_SRC} + src/xbt/mmalloc/mm.c + ) +endif(HAVE_MMAP) + set(GTNETS_SRC src/surf/gtnets/gtnets_simulator.cc src/surf/gtnets/gtnets_topology.cc @@ -262,6 +268,13 @@ set(SIMDAG_SRC src/simdag/sd_workstation.c src/simdag/sd_daxloader.c ) +if(HAVE_CGRAPH_H) + set(SIMDAG_SRC + ${SIMDAG_SRC} + src/simdag/sd_dotloader.c + ) + +endif(HAVE_CGRAPH_H) set(GRAS_COMMON_SRC src/gras/gras.c @@ -308,9 +321,11 @@ 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 ) set(TRACING_SRC + src/instr/instr_config.c src/instr/interface.c src/instr/general.c src/instr/paje.c @@ -319,6 +334,7 @@ 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/variables_instr.c src/instr/private.h ) @@ -342,11 +358,7 @@ set(MC_SRC src/mc/private.h ) - set(install_HEADERS -include/gras.h -include/xbt.h -include/simgrid_config.h include/xbt/misc.h include/xbt/sysdep.h include/xbt/virtu.h @@ -398,21 +410,23 @@ 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 +include/gras.h +include/xbt.h ) set(TEST_UNITS -cunit_unit.c -ex_unit.c -dynar_unit.c -dict_unit.c -set_unit.c -swag_unit.c -xbt_str_unit.c -xbt_strbuff_unit.c -xbt_sha_unit.c -config_unit.c -xbt_synchro_unit.c +${PROJECT_DIRECTORY}/src/cunit_unit.c +${PROJECT_DIRECTORY}/src/ex_unit.c +${PROJECT_DIRECTORY}/src/dynar_unit.c +${PROJECT_DIRECTORY}/src/dict_unit.c +${PROJECT_DIRECTORY}/src/set_unit.c +${PROJECT_DIRECTORY}/src/swag_unit.c +${PROJECT_DIRECTORY}/src/xbt_str_unit.c +${PROJECT_DIRECTORY}/src/xbt_strbuff_unit.c +${PROJECT_DIRECTORY}/src/xbt_sha_unit.c +${PROJECT_DIRECTORY}/src/config_unit.c +${PROJECT_DIRECTORY}/src/xbt_synchro_unit.c ) set(TEST_CFILES @@ -429,33 +443,9 @@ src/xbt/config.c src/xbt/xbt_synchro.c ) -#Here must have all files which permit to generate source files -set(SRC_TO_LOOK -src/surf/simgrid.dtd -src/xbt/graphxml.dtd -src/simdag/dax.dtd -examples/gras/ping/ping.xml -examples/gras/rpc/rpc.xml -examples/gras/spawn/spawn.xml -examples/gras/timer/timer.xml -examples/gras/chrono/chrono.xml -examples/gras/mutual_exclusion/simple_token/simple_token.xml -examples/gras/mmrpc/mmrpc.xml -examples/gras/all2all/all2all.xml -examples/gras/pmm/pmm.xml -examples/gras/synchro/synchro.xml -examples/gras/properties/properties.xml -teshsuite/gras/msg_handle/msg_handle.xml -teshsuite/gras/empty_main/empty_main.xml -teshsuite/gras/small_sleep/small_sleep.xml -examples/amok/bandwidth/bandwidth.xml -examples/amok/saturate/saturate.xml -${TEST_CFILES} -) - ### depend of some variables setted upper # -->CONTEXT_THREADS -if(${CONTEXT_THREADS}) +if(${CONTEXT_THREADS}) #pthread set(SURF_SRC ${SURF_SRC} src/xbt/xbt_os_thread.c @@ -465,18 +455,28 @@ if(${CONTEXT_THREADS}) ${EXTRA_DIST} src/simix/smx_context_sysv.c ) -else(${CONTEXT_THREADS}) +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 - ) + + 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) set(GTNETS_USED @@ -507,9 +507,15 @@ set(simgrid_sources ${GRAS_COMMON_SRC} ${GRAS_SG_SRC} ${AMOK_SRC} - ${MC_SRC} ) +if(HAVE_MC) + set(simgrid_sources + ${simgrid_sources} + ${MC_SRC} + ) +endif(HAVE_MC) + ### Gras Lib sources set(gras_sources ${XBT_SRC} @@ -557,23 +563,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" @@ -600,6 +589,42 @@ 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/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" @@ -611,7 +636,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" @@ -621,7 +645,6 @@ file(GLOB_RECURSE xml_files "testsuite/*.xml" "tools/*.xml" ) -#message("\n\nxml:\n${xml_files}") file(GLOB_RECURSE tesh_files "examples/*.tesh" @@ -631,7 +654,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" @@ -695,8 +717,37 @@ 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 +) +file(GLOB_RECURSE doc_files +"doc/html/*" +) # This is the complete lise of what will be added to the source archive set(source_to_pack @@ -726,105 +777,7 @@ set(source_to_pack ${txt_files} ${TEST_CFILES} ${EXTRA_DIST} - - CMakeLists.txt - buildtools/Cmake/src/CTestConfig.cmake - buildtools/Cmake/src/CTestTestfile.cmake - # FIXME: these should be renamed to .cmake, I guess - buildtools/Cmake/src/CMakeCompleteInFiles.txt - buildtools/Cmake/src/CMakeDefinePackages.txt - buildtools/Cmake/src/CMakeDistrib.txt - buildtools/Cmake/src/CMakeDocs.txt - buildtools/Cmake/src/CMakeFlags.txt - buildtools/Cmake/src/CMakeJarAndClass.txt - buildtools/Cmake/src/CMakeMaintainerMode.txt - buildtools/Cmake/src/CMakeMakeExeLib.txt - buildtools/Cmake/src/CMakeOption.txt - buildtools/Cmake/src/CMakePrintArgs.txt - buildtools/Cmake/src/CMakeSupernovae.txt - buildtools/Cmake/src/CMakeTest.txt - buildtools/Cmake/src/memcheck_tests.txt - # FIXME: these should live in src/ and the content of src in root of Cmake/ maybe - buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c - buildtools/Cmake/prog_test/prog_getline.c - buildtools/Cmake/prog_test/prog_GRAS_ARCH.c - buildtools/Cmake/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c - buildtools/Cmake/prog_test/prog_gtnets.cpp - buildtools/Cmake/prog_test/prog_max_size.c - buildtools/Cmake/prog_test/prog_mutex_timedlock.c - buildtools/Cmake/prog_test/prog_printf_null.c - buildtools/Cmake/prog_test/prog_sem_init.c - buildtools/Cmake/prog_test/prog_sem_timedwait.c - buildtools/Cmake/prog_test/prog_snprintf.c - buildtools/Cmake/prog_test/prog_stackgrowth.c - buildtools/Cmake/prog_test/prog_stacksetup.c - buildtools/Cmake/prog_test/prog_va_copy.c - buildtools/Cmake/prog_test/prog_vsnprintf.c - # FIXME: these are badly named and placed - buildtools/Cmake/src/c_gras_config.h.in - buildtools/Cmake/src/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 -) -#set(script_to_install -# src/smpi/smpicc -# src/smpi/smpirun -# tools/MSG_visualization/colorize.pl -#) -# tools/sg_unit_extractor.pl -# tools/doxygen/index_create.pl -# tools/doxygen/toc_create.pl -# tools/doxygen/index_php.pl -# tools/doxygen/doxygen_postprocesser.pl -# tools/doxygen/bibtex2html_table_count.pl -# tools/doxygen/bibtex2html_postprocessor.pl -# tools/doxygen/xbt_log_extract_hierarchy.pl -# tools/MSG_visualization/trace2fig.pl - -#message("\n\ntesh:\n${txt_files}") + ${CMAKE_SOURCE_FILES} + ${bin_files} + ${doc_files} +)