Merge pull request #2546 from proydakov/msvc-noexcept-fix
Fixed msvc 2019 nmake noexcept build.
This commit is contained in:
		
						commit
						9801a9e42a
					
				@ -193,6 +193,9 @@ elseif(MSVC)
 | 
				
			|||||||
    endif()
 | 
					    endif()
 | 
				
			||||||
    if(ENABLE_EXCEPTIONS)
 | 
					    if(ENABLE_EXCEPTIONS)
 | 
				
			||||||
        add_compile_options(/EHsc) # Enable Exceptions
 | 
					        add_compile_options(/EHsc) # Enable Exceptions
 | 
				
			||||||
 | 
						else()
 | 
				
			||||||
 | 
					        string(REGEX REPLACE /EHsc "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Try to remove default /EHsc cxx_flag
 | 
				
			||||||
 | 
					        add_compile_definitions(_HAS_EXCEPTIONS=0)
 | 
				
			||||||
    endif()
 | 
					    endif()
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user