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]
/
buildtools
/
Cmake
/
MakeLibWin.cmake
diff --git
a/buildtools/Cmake/MakeLibWin.cmake
b/buildtools/Cmake/MakeLibWin.cmake
index
19fb446
..
081c6e0
100644
(file)
--- a/
buildtools/Cmake/MakeLibWin.cmake
+++ b/
buildtools/Cmake/MakeLibWin.cmake
@@
-1,15
+1,11
@@
### Make Libs
#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
### Make Libs
#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
+
+
add_library(simgrid SHARED ${simgrid_sources})
add_library(simgrid SHARED ${simgrid_sources})
-add_library(gras SHARED ${gras_sources})
-set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version} OUTPUT_NAME "gras")
-set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")
+set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" LINK_FLAGS "-shared" VERSION ${libsimgrid_version} PREFIX "lib" SUFFIX ".dll" IMPORT_PREFIX "lib" IMPORT_SUFFIX ".dll")
-if(enable_smpi)
- add_library(smpi SHARED ${SMPI_SRC})
- set_target_properties(smpi PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsmpi_version} OUTPUT_NAME "smpi")
-endif(enable_smpi)
# libpthreadGC2.dll
if(ARCH_32_BITS)
# libpthreadGC2.dll
if(ARCH_32_BITS)
@@
-28,9
+24,7
@@
else()
)
endif()
)
endif()
-set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")
-set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")
-set(SMPI_DEP "${LIBRARY_OUTPUT_PATH}/libsimgrid.dll")
+set(SIMGRID_DEP "-lws2_32 -L${PATH_PCRE_LIB} -L${PATH_PTHREAD_LIB} -lm -lpcre -lpthreadGC2")
if(ARCH_32_BITS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
if(ARCH_32_BITS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
@@
-39,12
+33,7
@@
else()
# message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
endif()
# message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
endif()
-target_link_libraries(gras ${GRAS_DEP})
target_link_libraries(simgrid ${SIMGRID_DEP})
target_link_libraries(simgrid ${SIMGRID_DEP})
-if(enable_smpi)
-add_dependencies(smpi simgrid)
-target_link_libraries(smpi ${SMPI_DEP})
-endif(enable_smpi)
find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
message(STATUS "pexports: ${PEXPORTS_PATH}")
find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
message(STATUS "pexports: ${PEXPORTS_PATH}")
@@
-52,11
+41,3
@@
if(PEXPORTS_PATH)
add_custom_command(TARGET simgrid POST_BUILD
COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def)
endif()
add_custom_command(TARGET simgrid POST_BUILD
COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def)
endif()
-
-if(enable_smpi)
- add_library(smpi SHARED ${SMPI_SRC})
- set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version} OUTPUT_NAME "smpi")
-
- set(SMPI_LDEP "")
- target_link_libraries(smpi simgrid ${SMPI_LDEP})
-endif()