mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 03:20:05 +00:00 
			
		
		
		
	Don't use a generator expression to determine ${crypto_ROOT} for AWS SDK
This commit is contained in:
		
							parent
							
								
									e61ac8814d
								
							
						
					
					
						commit
						eb47443bba
					
				
					 1 changed files with 10 additions and 2 deletions
				
			
		
							
								
								
									
										12
									
								
								external/aws-sdk-cpp.cmake
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								external/aws-sdk-cpp.cmake
									
										
									
									
										vendored
									
									
								
							|  | @ -24,8 +24,16 @@ set(CMAKE_CXX_FLAGS_PREV "${CMAKE_CXX_FLAGS}") | ||||||
| # Configure OpenSSL crypto library | # Configure OpenSSL crypto library | ||||||
| find_package(OpenSSL) | find_package(OpenSSL) | ||||||
| set(crypto_INCLUDE_DIR ${OpenSSL_INCLUDE_DIR}) | set(crypto_INCLUDE_DIR ${OpenSSL_INCLUDE_DIR}) | ||||||
| set(crypto_ROOT $<$<CONFIG:Release>:${openssl_PACKAGE_FOLDER_RELEASE}> | 
 | ||||||
|                 $<$<CONFIG:Debug>:${openssl_PACKAGE_FOLDER_DEBUG}>) | # FIXME: | ||||||
|  | # Cannot use a generator expression here, since this is needed at config time. | ||||||
|  | # But, this breaks multi-config. Need to find a better solution. | ||||||
|  | if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") | ||||||
|  |     set(crypto_ROOT ${openssl_PACKAGE_FOLDER_DEBUG}) | ||||||
|  | else() | ||||||
|  |     set(crypto_ROOT ${openssl_PACKAGE_FOLDER_RELEASE}) | ||||||
|  | endif() | ||||||
|  | 
 | ||||||
| set(crypto_SHARED_LIBRARY_ROOT ${crypto_ROOT}) # libcrypto.so libcrypto.dylib | set(crypto_SHARED_LIBRARY_ROOT ${crypto_ROOT}) # libcrypto.so libcrypto.dylib | ||||||
| set(crypto_STATIC_LIBRARY_ROOT ${crypto_ROOT}) # libcrypto.a | set(crypto_STATIC_LIBRARY_ROOT ${crypto_ROOT}) # libcrypto.a | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat