Permalink
Browse files

Merge pull request #5734 from geographika/msvc-compiler

Check for MSVC rather than WIN32 when setting compiler flags
  • Loading branch information...
rouault committed Feb 2, 2019
2 parents 2b4d47b + b559849 commit 5e3a27a1072a10ddfbba319dbacb50266a79248e
Showing with 4 additions and 2 deletions.
  1. +4 −2 CMakeLists.txt
@@ -905,8 +905,10 @@ ms_link_libraries( ${CMAKE_DL_LIBS} m )
endif(UNIX)

if (WIN32)
ms_link_libraries( ${MS_EXTERNAL_LIBS} ws2_32.lib)
set_target_properties(mapserver PROPERTIES COMPILE_FLAGS "/wd4267 /wd4244 /wd4018")
ms_link_libraries( ${MS_EXTERNAL_LIBS} ws2_32.lib)
if (MSVC)
set_target_properties(mapserver PROPERTIES COMPILE_FLAGS "/wd4267 /wd4244 /wd4018")
endif(MSVC)
endif (WIN32)

configure_file (

0 comments on commit 5e3a27a

Please sign in to comment.