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
couple cleanups
[simgrid.git]
/
tools
/
cmake
/
DefinePackages.cmake
diff --git
a/tools/cmake/DefinePackages.cmake
b/tools/cmake/DefinePackages.cmake
index
1dec930
..
6924941
100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-270,20
+270,14
@@
set(XBT_SRC
src/xbt/xbt_strbuff.c
src/xbt/xbt_virtu.c
src/xbt_modinter.h
src/xbt/xbt_strbuff.c
src/xbt/xbt_virtu.c
src/xbt_modinter.h
-
)
if(HAVE_MMALLOC)
)
if(HAVE_MMALLOC)
- set(XBT_SRC
- ${XBT_SRC}
- src/xbt/mmalloc/mm.c
- )
+ set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c )
endif()
endif()
-set(NS3_SRC
- src/surf/network_ns3.cpp
- src/surf/ns3/ns3_simulator.cc
- )
+set(NS3_SRC src/surf/network_ns3.cpp
+ src/surf/ns3/ns3_simulator.cc )
set(SURF_SRC
src/surf/AsImpl.cpp
set(SURF_SRC
src/surf/AsImpl.cpp
@@
-331,13
+325,12
@@
set(SURF_SRC
src/surf/ptask_L07.cpp
)
src/surf/ptask_L07.cpp
)
-set(SIMIX_GENERATED_SRC
- src/simix/popping_generated.cpp
- )
+set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp )
set(SIMIX_SRC
src/simix/libsmx.cpp
src/simix/smx_context.cpp
src/simix/Context.cpp
set(SIMIX_SRC
src/simix/libsmx.cpp
src/simix/smx_context.cpp
src/simix/Context.cpp
+ src/simix/RawContext.cpp
src/simix/smx_deployment.cpp
src/simix/smx_environment.cpp
src/simix/smx_global.cpp
src/simix/smx_deployment.cpp
src/simix/smx_environment.cpp
src/simix/smx_global.cpp
@@
-352,17
+345,6
@@
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/RawContext.cpp)
-else()
- set(SIMIX_SRC
- ${SIMIX_SRC}
- src/simix/RawContext.cpp)
-endif()
-
# Boost context may not be available
if (HAVE_BOOST_CONTEXTS)
set(SIMIX_SRC
# Boost context may not be available
if (HAVE_BOOST_CONTEXTS)
set(SIMIX_SRC
@@
-491,9
+473,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})
@@
-622,8
+602,7
@@
set(MC_SRC
src/mc/Transition.hpp
)
src/mc/Transition.hpp
)
-set(MC_SIMGRID_MC_SRC
- src/mc/simgrid_mc.cpp)
+set(MC_SIMGRID_MC_SRC src/mc/simgrid_mc.cpp)
set(headers_to_install
include/msg/msg.h
set(headers_to_install
include/msg/msg.h
@@
-722,27
+701,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
@@
-999,7
+967,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