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
1208987
..
683a623
100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-238,7
+238,7
@@
set(XBT_SRC
src/xbt/RngStream.c
src/xbt/automaton/automaton.c
src/xbt/automaton/automatonparse_promela.c
src/xbt/RngStream.c
src/xbt/automaton/automaton.c
src/xbt/automaton/automatonparse_promela.c
- src/xbt/config.c
+ src/xbt/config.c
pp
src/xbt/cunit.c
src/xbt/dict.c
src/xbt/dict_cursor.c
src/xbt/cunit.c
src/xbt/dict.c
src/xbt/dict_cursor.c
@@
-491,9
+491,7
@@
set(JTRACE_C_SRC
src/bindings/java/jtrace.h
)
src/bindings/java/jtrace.h
)
-set(JTRACE_JAVA_SRC
- src/bindings/java/org/simgrid/trace/Trace.java
-)
+set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java)
list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
@@
-619,6
+617,7
@@
set(MC_SRC
src/mc/mc_xbt.hpp
src/mc/mc_xbt.cpp
src/mc/mc_exit.h
src/mc/mc_xbt.hpp
src/mc/mc_xbt.cpp
src/mc/mc_exit.h
+ src/mc/Transition.hpp
)
set(MC_SIMGRID_MC_SRC
)
set(MC_SIMGRID_MC_SRC
@@
-665,6
+664,7
@@
set(headers_to_install
include/xbt/automaton.hpp
include/xbt/base.h
include/xbt/config.h
include/xbt/automaton.hpp
include/xbt/base.h
include/xbt/config.h
+ include/xbt/config.hpp
include/xbt/cunit.h
include/xbt/dict.h
include/xbt/string.hpp
include/xbt/cunit.h
include/xbt/dict.h
include/xbt/string.hpp
@@
-720,27
+720,16
@@
else() # NOT pthread
endif()
if(${HAVE_THREAD_CONTEXTS}) #pthread
endif()
if(${HAVE_THREAD_CONTEXTS}) #pthread
- set(SURF_SRC
- ${SURF_SRC}
- src/xbt/xbt_os_thread.c
- )
+ set(SURF_SRC ${SURF_SRC} src/xbt/xbt_os_thread.c)
else() # NOT pthread
else() # NOT pthread
- set(EXTRA_DIST
- ${EXTRA_DIST}
- src/xbt/xbt_os_thread.c
+ set(EXTRA_DIST ${EXTRA_DIST} src/xbt/xbt_os_thread.c
)
endif()
if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
)
endif()
if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
- set(SURF_SRC
- ${SURF_SRC}
- src/simix/UContext.cpp
- )
+ set(SURF_SRC ${SURF_SRC} src/simix/UContext.cpp)
else() # NOT ucontext
else() # NOT ucontext
- set(EXTRA_DIST
- ${EXTRA_DIST}
- src/simix/UContext.cpp
- )
+ set(EXTRA_DIST ${EXTRA_DIST} src/simix/UContext.cpp)
endif()
### Simgrid Lib sources
endif()
### Simgrid Lib sources
@@
-997,7
+986,6
@@
set(CMAKE_SOURCE_FILES
tools/cmake/MakeLibWin.cmake
tools/cmake/Modules/FindGFortran.cmake
tools/cmake/Modules/FindGraphviz.cmake
tools/cmake/MakeLibWin.cmake
tools/cmake/Modules/FindGFortran.cmake
tools/cmake/Modules/FindGraphviz.cmake
- tools/cmake/Modules/FindLibSigc++.cmake
tools/cmake/Modules/FindLibdw.cmake
tools/cmake/Modules/FindLibunwind.cmake
tools/cmake/Modules/FindLuaSimgrid.cmake
tools/cmake/Modules/FindLibdw.cmake
tools/cmake/Modules/FindLibunwind.cmake
tools/cmake/Modules/FindLuaSimgrid.cmake
@@
-1014,7
+1002,6
@@
set(CMAKE_SOURCE_FILES
tools/cmake/scripts/IPC/Run/Win32IO.pm
tools/cmake/scripts/IPC/Run/Win32Pump.pm
tools/cmake/scripts/Diff.pm
tools/cmake/scripts/IPC/Run/Win32IO.pm
tools/cmake/scripts/IPC/Run/Win32Pump.pm
tools/cmake/scripts/Diff.pm
- tools/cmake/scripts/generate_memcheck_tests.pl
tools/cmake/scripts/my_valgrind.pl
tools/cmake/scripts/update_tesh.pl
tools/cmake/UnitTesting.cmake
tools/cmake/scripts/my_valgrind.pl
tools/cmake/scripts/update_tesh.pl
tools/cmake/UnitTesting.cmake