From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 11 Sep 2015 20:36:51 +0000 (+0200)
Subject: [MSVC] don't pass gcc flags to MSVC, try to define XBT_PUBLIC properly
X-Git-Tag: v3_12~248
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/040c3fbc16eeba3aeeac3ac0572a33db4ad3f98a?ds=sidebyside

[MSVC] don't pass gcc flags to MSVC, try to define XBT_PUBLIC properly
---

diff --git a/tools/cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake
index d11222fade..516f138d9b 100644
--- a/tools/cmake/MakeLibWin.cmake
+++ b/tools/cmake/MakeLibWin.cmake
@@ -3,21 +3,37 @@
 
 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" 
+       LINK_FLAGS "-shared" 
+       VERSION ${libsimgrid_version} 
+       PREFIX "lib" SUFFIX ".dll" 
+       IMPORT_PREFIX "lib" 
+       IMPORT_SUFFIX ".dll")
+  
+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})