A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
tools
/
cmake
/
DefinePackages.cmake
diff --git
a/tools/cmake/DefinePackages.cmake
b/tools/cmake/DefinePackages.cmake
index
800f58b
..
b8213d5
100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-332,7
+332,6
@@
set(SURF_SRC
src/surf/host_clm03.cpp
src/surf/HostImpl.cpp
src/surf/ptask_L07.cpp
src/surf/host_clm03.cpp
src/surf/HostImpl.cpp
src/surf/ptask_L07.cpp
- src/xbt/xbt_sg_stubs.c
)
set(SIMIX_GENERATED_SRC
)
set(SIMIX_GENERATED_SRC
@@
-423,13
+422,9
@@
set(SIMDAG_SRC
src/simdag/sd_workstation.cpp
)
if(HAVE_GRAPHVIZ)
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()
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
endif()
set(BINDINGS_SRC
@@
-703,8
+698,7
@@
set(headers_to_install
)
set(source_of_generated_headers
include/simgrid_config.h.in
)
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
### depend of some variables setted upper
# -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
@@
-760,37
+754,22
@@
set(simgrid_sources
${XBT_SRC}
)
${XBT_SRC}
)
-if(${HAVE_JEDULE})
- set(simgrid_sources
- ${simgrid_sources}
- ${JEDULE_SRC}
- )
+if(${HAVE_JEDULE})
+ set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC})
else()
else()
- set(EXTRA_DIST
- ${EXTRA_DIST}
- ${JEDULE_SRC}
- )
+ set(EXTRA_DIST ${EXTRA_DIST} ${JEDULE_SRC})
endif()
if(enable_smpi)
endif()
if(enable_smpi)
- set(simgrid_sources
- ${simgrid_sources}
- ${SMPI_SRC}
- )
+ set(simgrid_sources ${simgrid_sources} ${SMPI_SRC})
endif()
if(HAVE_MC)
endif()
if(HAVE_MC)
- set(simgrid_sources
- ${simgrid_sources}
- ${MC_SRC}
- )
+ set(simgrid_sources ${simgrid_sources} ${MC_SRC})
endif()
if(HAVE_NS3)
endif()
if(HAVE_NS3)
- set(simgrid_sources
- ${simgrid_sources}
- ${NS3_SRC}
- )
+ set(simgrid_sources ${simgrid_sources} ${NS3_SRC})
endif()
# WINDOWS
endif()
# WINDOWS
@@
-804,15
+783,9
@@
if(WIN32)
endif()
if(${HAVE_LUA})
endif()
if(${HAVE_LUA})
- set(simgrid_sources
- ${simgrid_sources}
- ${LUA_SRC}
- )
+ set(simgrid_sources ${simgrid_sources} ${LUA_SRC})
else()
else()
- set(EXTRA_DIST
- ${EXTRA_DIST}
- ${LUA_SRC}
- )
+ set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC})
endif()
set(DOC_SOURCES
endif()
set(DOC_SOURCES
@@
-976,10
+949,7
@@
set(CMAKEFILES_TXT
examples/msg/chainsend/CMakeLists.txt
examples/msg/chord/CMakeLists.txt
examples/msg/cloud/CMakeLists.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
examples/msg/exception/CMakeLists.txt
examples/msg/gtnets/CMakeLists.txt
examples/msg/icomms/CMakeLists.txt
@@
-1003,8
+973,6
@@
set(CMAKEFILES_TXT
examples/msg/tracing/CMakeLists.txt
examples/s4u/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
examples/simdag/CMakeLists.txt
examples/simdag/dax/CMakeLists.txt
@@
-1022,8
+990,7
@@
set(CMAKEFILES_TXT
examples/smpi/energy/f90/CMakeLists.txt
teshsuite/bug-17132/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
teshsuite/mc/CMakeLists.txt
teshsuite/mc/dwarf/CMakeLists.txt
teshsuite/mc/dwarf_expression/CMakeLists.txt
@@
-1092,7
+1059,6
@@
set(CMAKEFILES_TXT
teshsuite/surf/trace_usage/CMakeLists.txt
teshsuite/xbt/CMakeLists.txt
teshsuite/surf/trace_usage/CMakeLists.txt
teshsuite/xbt/CMakeLists.txt
- teshsuite/xbt/log_usage/CMakeLists.txt
teshsuite/xbt/mmalloc/CMakeLists.txt
tools/CMakeLists.txt
teshsuite/xbt/mmalloc/CMakeLists.txt
tools/CMakeLists.txt
@@
-1137,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/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_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
tools/cmake/test_prog/prog_mutex_timedlock.c
tools/cmake/test_prog/prog_sem_init.c
tools/cmake/test_prog/prog_sem_open.c