[windows] don't mess with -m32 or -m64 gcc flags

[simgrid.git] / tools / cmake / MakeLibWin.cmake

diff --git a/tools/cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake
index d11222f..8bd3b5f 100644 (file)
--- a/tools/cmake/MakeLibWin.cmake
+++ b/tools/cmake/MakeLibWin.cmake
@@ -3,28 +3,33 @@
 
 add_library(simgrid SHARED ${simgrid_sources})
 
-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(MSVC)
+  set_target_properties(simgrid  PROPERTIES 
+       COMPILE_FLAGS "/D_XBT_DLL_EXPORT /DDLL_EXPORT" 
+       VERSION ${libsimgrid_version} )
+else()
+  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")
 
-set(SIMGRID_DEP "-lws2_32 -lm")
+  set(SIMGRID_DEP "-lws2_32 -lm")
 
-if (HAVE_PTHREAD)
-  set(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
-endif()
+  if (HAVE_PTHREAD)
+    set(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
+  endif()
 
-if(ARCH_32_BITS)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486 -D_I_X86_")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -march=i486 -D_I_X86_")
-else()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -D_AMD64_")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -D_AMD64_")
-  #        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
+  #if(ARCH_32_BITS)
+  #  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486 -D_I_X86_")
+  #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -march=i486 -D_I_X86_")
+  #else()
+  #  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -D_AMD64_")
+  #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -D_AMD64_")
+  #  #        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
+  #endif()
 endif()
 
 target_link_libraries(simgrid  ${SIMGRID_DEP})
 
-find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
-message(STATUS "pexports: ${PEXPORTS_PATH}")
-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()