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
Use std::atomic instead of __sync_fetch_and_add for portability
[simgrid.git]
/
tools
/
cmake
/
DefinePackages.cmake
diff --git
a/tools/cmake/DefinePackages.cmake
b/tools/cmake/DefinePackages.cmake
index fa90c0801d4a98318e25fa5899be9fd5fb50d0db..6084499eb48620e7e3356d855eb52418ee1d8795 100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-87,7
+87,6
@@
set(EXTRA_DIST
src/surf/host_clm03.hpp
src/surf/host_interface.hpp
src/surf/host_ptask_L07.hpp
src/surf/host_clm03.hpp
src/surf/host_interface.hpp
src/surf/host_ptask_L07.hpp
- src/win32/config.h
src/xbt/automaton/automaton_lexer.yy.c
src/xbt/automaton/parserPromela.lex
src/xbt/automaton/parserPromela.tab.cacc
src/xbt/automaton/automaton_lexer.yy.c
src/xbt/automaton/parserPromela.lex
src/xbt/automaton/parserPromela.tab.cacc
@@
-266,7
+265,7
@@
set(XBT_SRC
src/xbt/lib.c
src/xbt/log.c
src/xbt/mallocator.c
src/xbt/lib.c
src/xbt/log.c
src/xbt/mallocator.c
- src/xbt/parmap.c
+ src/xbt/parmap.c
pp
src/xbt/set.c
src/xbt/setset.c
src/xbt/snprintf.c
src/xbt/set.c
src/xbt/setset.c
src/xbt/snprintf.c
@@
-277,6
+276,7
@@
set(XBT_SRC
src/xbt/xbt_main.c
src/xbt/xbt_matrix.c
src/xbt/xbt_os_time.c
src/xbt/xbt_main.c
src/xbt/xbt_matrix.c
src/xbt/xbt_os_time.c
+ src/xbt/xbt_os_file.c
src/xbt/xbt_peer.c
src/xbt/xbt_queue.c
src/xbt/xbt_replay.c
src/xbt/xbt_peer.c
src/xbt/xbt_queue.c
src/xbt/xbt_replay.c
@@
-353,7
+353,6
@@
set(SIMIX_SRC
src/simix/libsmx.c
src/simix/smx_context.c
src/simix/smx_context_base.c
src/simix/libsmx.c
src/simix/smx_context.c
src/simix/smx_context_base.c
- src/simix/smx_context_raw.c
src/simix/smx_deployment.c
src/simix/smx_environment.c
src/simix/smx_global.c
src/simix/smx_deployment.c
src/simix/smx_environment.c
src/simix/smx_global.c
@@
-368,6
+367,18
@@
set(SIMIX_SRC
${SIMIX_GENERATED_SRC}
)
${SIMIX_GENERATED_SRC}
)
+# Don't try to compile our inline assembly with MSVC
+if (MSVC)
+ set(EXTRA_DIST
+ ${EXTRA_DIST}
+ src/simix/smx_context_raw.c)
+else()
+ set(SIMIX_SRC
+ ${SIMIX_SRC}
+ src/simix/smx_context_raw.c)
+endif()
+
+# Boost context may not be available
if (HAVE_BOOST_CONTEXT)
set(SIMIX_SRC
${SIMIX_SRC}
if (HAVE_BOOST_CONTEXT)
set(SIMIX_SRC
${SIMIX_SRC}
@@
-702,6
+713,7
@@
set(headers_to_install
include/xbt/dynar.h
include/xbt/ex.h
include/xbt/fifo.h
include/xbt/dynar.h
include/xbt/ex.h
include/xbt/fifo.h
+ include/xbt/file.h
include/xbt/function_types.h
include/xbt/graph.h
include/xbt/graphxml.h
include/xbt/function_types.h
include/xbt/graph.h
include/xbt/graphxml.h
@@
-867,6
+879,7
@@
set(DOC_SOURCES
doc/doxygen/deployment.doc
doc/doxygen/footer.html
doc/doxygen/getting_started.doc
doc/doxygen/deployment.doc
doc/doxygen/footer.html
doc/doxygen/getting_started.doc
+ doc/doxygen/getting_started_index.doc
doc/doxygen/header.html
doc/doxygen/help.doc
doc/doxygen/index.doc
doc/doxygen/header.html
doc/doxygen/help.doc
doc/doxygen/index.doc
@@
-891,7
+904,7
@@
set(DOC_SOURCES
doc/doxygen/pls.doc
doc/doxygen/stylesheet.css
doc/doxygen/tracing.doc
doc/doxygen/pls.doc
doc/doxygen/stylesheet.css
doc/doxygen/tracing.doc
- doc/doxygen/
use
.doc
+ doc/doxygen/
examples
.doc
doc/manpage/smpicc.1
doc/manpage/smpicxx.1
doc/manpage/smpicc.1
doc/manpage/smpicxx.1
@@
-927,6
+940,7
@@
set(DOC_TOOLS
tools/doxygen/fig2dev_postprocessor.pl
tools/doxygen/index_create.pl
tools/doxygen/xbt_log_extract_hierarchy.pl
tools/doxygen/fig2dev_postprocessor.pl
tools/doxygen/index_create.pl
tools/doxygen/xbt_log_extract_hierarchy.pl
+ tools/doxygen/list_routing_models_examples.sh
)
# these files get copied automatically to the html documentation
)
# these files get copied automatically to the html documentation
@@
-942,6
+956,7
@@
set(DOC_IMG
${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
+ ${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png