File tree Expand file tree Collapse file tree 2 files changed +13
-14
lines changed Expand file tree Collapse file tree 2 files changed +13
-14
lines changed Original file line number Diff line number Diff line change @@ -313,7 +313,7 @@ Note that this requires linking Boost statically"
313313  if  (MSVC )
314314    option (MSVC_LINK_VERBOSE
315315      "Pass verbose linking options when linking libraries and executables" 
316-       on )
316+       ON )
317317
318318    option (ARROW_USE_CLCACHE
319319      "Use clcache if available" 
Original file line number Diff line number Diff line change @@ -415,17 +415,16 @@ message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
415415# ---------------------------------------------------------------------- 
416416# MSVC-specific linker options 
417417
418- set (MSVC_LINKER_FLAGS)
419- 
420- if  (MSVC_LINK_VERBOSE)
421-   set (MSVC_LINKER_FLAGS "${MSVC_LINKER_FLAGS}  /VERBOSE:LIB" )
418+ if  (MSVC )
419+   set (MSVC_LINKER_FLAGS)
420+   if  (MSVC_LINK_VERBOSE)
421+     set (MSVC_LINKER_FLAGS "${MSVC_LINKER_FLAGS}  /VERBOSE:LIB" )
422+   endif ()
423+   set (MSVC_LINKER_FLAGS "${MSVC_LINKER_FLAGS}  /NODEFAULTLIB:LIBCMT" )
424+   set (CMAKE_EXE_LINKER_FLAGS 
425+     "${CMAKE_EXE_LINKER_FLAGS}  ${MSVC_LINKER_FLAGS} " )
426+   set (CMAKE_MODULE_LINKER_FLAGS
427+     "${CMAKE_MODULE_LINKER_FLAGS}  ${MSVC_LINKER_FLAGS} " )
428+   set (CMAKE_SHARED_LINKER_FLAGS
429+     "${CMAKE_SHARED_LINKER_FLAGS}  ${MSVC_LINKER_FLAGS} " )
422430endif ()
423- 
424- set (MSVC_LINKER_FLAGS "${MSVC_LINKER_FLAGS}  /NODEFAULTLIB:LIBCMT" )
425- 
426- set (CMAKE_EXE_LINKER_FLAGS 
427-   "${CMAKE_EXE_LINKER_FLAGS}  ${MSVC_LINKER_FLAGS} " )
428- set (CMAKE_MODULE_LINKER_FLAGS
429-   "${CMAKE_MODULE_LINKER_FLAGS}  ${MSVC_LINKER_FLAGS} " )
430- set (CMAKE_SHARED_LINKER_FLAGS
431-   "${CMAKE_SHARED_LINKER_FLAGS}  ${MSVC_LINKER_FLAGS} " )
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments