mirror of
				https://github.com/Mbed-TLS/mbedtls.git
				synced 2025-11-03 20:33:16 +03:00 
			
		
		
		
	Merge remote-tracking branch 'origin/pr/2657' into mbedtls-2.16
* origin/pr/2657: Create link to include/mbedtls only when testing is enabled
This commit is contained in:
		@@ -228,7 +228,6 @@ if(ENABLE_TESTING)
 | 
			
		||||
            COMMAND mv DartConfiguration.tcl.bak DartConfiguration.tcl
 | 
			
		||||
        )
 | 
			
		||||
    endif(UNIX)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
    # Make scripts needed for testing available in an out-of-source build.
 | 
			
		||||
    if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 | 
			
		||||
@@ -238,3 +237,4 @@ if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 | 
			
		||||
        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DartConfiguration.tcl
 | 
			
		||||
                    ${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl COPYONLY)
 | 
			
		||||
    endif()
 | 
			
		||||
endif()
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,6 @@ if(INSTALL_MBEDTLS_HEADERS)
 | 
			
		||||
endif(INSTALL_MBEDTLS_HEADERS)
 | 
			
		||||
 | 
			
		||||
# Make config.h available in an out-of-source build. ssl-opt.sh requires it.
 | 
			
		||||
if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 | 
			
		||||
if (ENABLE_TESTING AND NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 | 
			
		||||
    link_to_source(mbedtls)
 | 
			
		||||
endif()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user