X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be5b1909ae03fa305b6aff11ef16e19de82966b5..3cf8dfbfab4595b3e7ae85d3cd89ce9dbcdd7a24:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 8062cf4e4f..b8213d5988 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -13,7 +13,6 @@ set(EXTRA_DIST src/include/surf/datatypes.h src/include/surf/maxmin.h src/include/surf/surf.h - src/include/xbt/win32_ucontext.h src/include/xbt/wine_dbghelp.h src/msg/msg_private.h src/portable.h @@ -107,7 +106,6 @@ set(EXTRA_DIST src/xbt/mmalloc/mmorecore.c src/xbt/mmalloc/mmprivate.h src/xbt/mmalloc/mrealloc.c - src/xbt/win32_ucontext.c tools/tesh/generate_tesh tools/lualib.patch teshsuite/lua/lua_platforms.tesh @@ -334,7 +332,6 @@ set(SURF_SRC src/surf/host_clm03.cpp src/surf/HostImpl.cpp src/surf/ptask_L07.cpp - src/xbt/xbt_sg_stubs.c ) set(SIMIX_GENERATED_SRC @@ -425,13 +422,9 @@ set(SIMDAG_SRC src/simdag/sd_workstation.cpp ) if(HAVE_GRAPHVIZ) - set(SIMDAG_SRC - ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp - ) + set(SIMDAG_SRC ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp) else() - set(EXTRA_DIST - ${EXTRA_DIST} src/simdag/sd_dotloader.cpp - ) + set(EXTRA_DIST ${EXTRA_DIST} src/simdag/sd_dotloader.cpp) endif() set(BINDINGS_SRC @@ -705,8 +698,7 @@ set(headers_to_install ) set(source_of_generated_headers include/simgrid_config.h.in - include/smpi/mpif.h.in - src/context_sysv_config.h.in) + include/smpi/mpif.h.in) ### depend of some variables setted upper # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS @@ -762,37 +754,22 @@ set(simgrid_sources ${XBT_SRC} ) -if(${HAVE_JEDULE}) - set(simgrid_sources - ${simgrid_sources} - ${JEDULE_SRC} - ) +if(${HAVE_JEDULE}) + set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC}) else() - set(EXTRA_DIST - ${EXTRA_DIST} - ${JEDULE_SRC} - ) + set(EXTRA_DIST ${EXTRA_DIST} ${JEDULE_SRC}) endif() if(enable_smpi) - set(simgrid_sources - ${simgrid_sources} - ${SMPI_SRC} - ) + set(simgrid_sources ${simgrid_sources} ${SMPI_SRC}) endif() if(HAVE_MC) - set(simgrid_sources - ${simgrid_sources} - ${MC_SRC} - ) + set(simgrid_sources ${simgrid_sources} ${MC_SRC}) endif() if(HAVE_NS3) - set(simgrid_sources - ${simgrid_sources} - ${NS3_SRC} - ) + set(simgrid_sources ${simgrid_sources} ${NS3_SRC}) endif() # WINDOWS @@ -801,21 +778,14 @@ if(WIN32) ${simgrid_sources} src/simix/ThreadContext.cpp src/simix/ThreadContext.hpp - src/xbt/win32_ucontext.c src/xbt/xbt_os_thread.c ) endif() if(${HAVE_LUA}) - set(simgrid_sources - ${simgrid_sources} - ${LUA_SRC} - ) + set(simgrid_sources ${simgrid_sources} ${LUA_SRC}) else() - set(EXTRA_DIST - ${EXTRA_DIST} - ${LUA_SRC} - ) + set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC}) endif() set(DOC_SOURCES @@ -943,7 +913,6 @@ set(txt_files README.java README.lua ChangeLog - ChangeLog.SimGrid-java INSTALL LICENSE-LGPL-2.1 NEWS @@ -980,10 +949,7 @@ set(CMAKEFILES_TXT examples/msg/chainsend/CMakeLists.txt examples/msg/chord/CMakeLists.txt examples/msg/cloud/CMakeLists.txt - examples/msg/energy/consumption/CMakeLists.txt - examples/msg/energy/onoff/CMakeLists.txt - examples/msg/energy/pstate/CMakeLists.txt - examples/msg/energy/vm/CMakeLists.txt + examples/msg/energy/CMakeLists.txt examples/msg/exception/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt @@ -1000,14 +966,13 @@ set(CMAKEFILES_TXT examples/msg/properties/CMakeLists.txt examples/msg/semaphores/CMakeLists.txt examples/msg/sendrecv/CMakeLists.txt + examples/msg/set-maestro/CMakeLists.txt examples/msg/start_kill_time/CMakeLists.txt examples/msg/suspend/CMakeLists.txt examples/msg/token_ring/CMakeLists.txt examples/msg/tracing/CMakeLists.txt examples/s4u/CMakeLists.txt - examples/s4u/basic/CMakeLists.txt - examples/s4u/io/CMakeLists.txt examples/simdag/CMakeLists.txt examples/simdag/dax/CMakeLists.txt @@ -1020,14 +985,12 @@ set(CMAKEFILES_TXT examples/smpi/CMakeLists.txt examples/smpi/smpi_msg_masterslave/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt - examples/smpi/MM/CMakeLists.txt examples/smpi/energy/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt examples/smpi/energy/f90/CMakeLists.txt teshsuite/bug-17132/CMakeLists.txt - teshsuite/java/semaphore/CMakeLists.txt - teshsuite/java/sleep_host_off/CMakeLists.txt + teshsuite/java/CMakeLists.txt teshsuite/mc/CMakeLists.txt teshsuite/mc/dwarf/CMakeLists.txt teshsuite/mc/dwarf_expression/CMakeLists.txt @@ -1053,23 +1016,11 @@ set(CMAKEFILES_TXT teshsuite/simix/stack_overflow/CMakeLists.txt teshsuite/smpi/CMakeLists.txt - teshsuite/smpi/allgather/CMakeLists.txt - teshsuite/smpi/allgatherv/CMakeLists.txt teshsuite/smpi/allreduce/CMakeLists.txt teshsuite/smpi/alltoall/CMakeLists.txt - teshsuite/smpi/alltoallv/CMakeLists.txt - teshsuite/smpi/barrier/CMakeLists.txt - teshsuite/smpi/bcast/CMakeLists.txt teshsuite/smpi/compute/CMakeLists.txt - teshsuite/smpi/gather/CMakeLists.txt - teshsuite/smpi/hvector/CMakeLists.txt - teshsuite/smpi/indexed/CMakeLists.txt - teshsuite/smpi/pingpong/CMakeLists.txt teshsuite/smpi/reduce/CMakeLists.txt - teshsuite/smpi/scatter/CMakeLists.txt teshsuite/smpi/shared/CMakeLists.txt - teshsuite/smpi/struct/CMakeLists.txt - teshsuite/smpi/vector/CMakeLists.txt teshsuite/smpi/isp/umpire/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -1107,14 +1058,8 @@ set(CMAKEFILES_TXT teshsuite/surf/surf_usage/CMakeLists.txt teshsuite/surf/trace_usage/CMakeLists.txt - teshsuite/xbt/heap_bench/CMakeLists.txt - teshsuite/xbt/log_large/CMakeLists.txt - teshsuite/xbt/log_usage/CMakeLists.txt - teshsuite/xbt/mallocator/CMakeLists.txt + teshsuite/xbt/CMakeLists.txt teshsuite/xbt/mmalloc/CMakeLists.txt - teshsuite/xbt/parallel_log/CMakeLists.txt - teshsuite/xbt/parmap_bench/CMakeLists.txt - teshsuite/xbt/parmap_test/CMakeLists.txt tools/CMakeLists.txt tools/graphicator/CMakeLists.txt @@ -1145,7 +1090,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake - tools/cmake/PrintArgs.cmake tools/cmake/scripts/IPC/Run.pm tools/cmake/scripts/IPC/Run/Debug.pm tools/cmake/scripts/IPC/Run/IO.pm @@ -1159,8 +1103,8 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake tools/cmake/src/internal_config.h.in - tools/cmake/test_prog/prog_AC_CHECK_MCSC.c tools/cmake/test_prog/prog_gnu_dynlinker.c + tools/cmake/test_prog/prog_makecontext.c tools/cmake/test_prog/prog_mutex_timedlock.c tools/cmake/test_prog/prog_sem_init.c tools/cmake/test_prog/prog_sem_open.c