Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
remove a few unused things for win, but we have more bugs after ..
authorAugustin Degomme <degomme@idpann.imag.fr>
Tue, 5 Feb 2013 17:16:09 +0000 (18:16 +0100)
committerAugustin Degomme <degomme@idpann.imag.fr>
Mon, 11 Feb 2013 15:16:59 +0000 (16:16 +0100)
buildtools/Cmake/MakeLibWin.cmake

index a8794ba..cc30280 100644 (file)
@@ -4,10 +4,6 @@ add_library(simgrid SHARED ${simgrid_sources})
 
 set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")
 
-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()
 
 # libpthreadGC2.dll
 if(ARCH_32_BITS)
@@ -26,7 +22,7 @@ else()
     )
 endif()
 
-set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")
+set(SIMGRID_DEP "ws2_32 -pthread -lpcre")
 set(SMPI_DEP "${LIBRARY_OUTPUT_PATH}/libsimgrid.dll")
 
 if(ARCH_32_BITS)
@@ -36,11 +32,7 @@ else()
   #        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
 endif()
 
-target_link_libraries(simgrid  ${SIMGRID_DEP})
-if(enable_smpi)
-add_dependencies(smpi simgrid)
-target_link_libraries(smpi     ${SMPI_DEP})
-endif()
+target_link_libraries(simgrid  ${SIMGRID_DEP} -lkernel32)
 
 find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
 message(STATUS "pexports: ${PEXPORTS_PATH}")
@@ -55,4 +47,4 @@ if(enable_smpi)
 
   set(SMPI_LDEP "")
   target_link_libraries(smpi   simgrid ${SMPI_LDEP})
-endif()
+endif()
\ No newline at end of file