vcpkg zlib dep fix (#385)
* vcpkg zlib dep fix * Use cmake.in file instead of write file directly Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
This commit is contained in:
		| @@ -234,11 +234,7 @@ endif() | |||||||
| option(USE_ZLIB "Enable zlib support" TRUE) | option(USE_ZLIB "Enable zlib support" TRUE) | ||||||
|  |  | ||||||
| if (USE_ZLIB) | if (USE_ZLIB) | ||||||
|   # This ZLIB_FOUND check is to help find a cmake manually configured zlib |   find_package(ZLIB REQUIRED) | ||||||
|   if (NOT ZLIB_FOUND) |  | ||||||
|     find_package(ZLIB REQUIRED) |  | ||||||
|   endif() |  | ||||||
|   target_include_directories(ixwebsocket PUBLIC $<BUILD_INTERFACE:${ZLIB_INCLUDE_DIRS}>) |  | ||||||
|   target_link_libraries(ixwebsocket PRIVATE ZLIB::ZLIB) |   target_link_libraries(ixwebsocket PRIVATE ZLIB::ZLIB) | ||||||
|  |  | ||||||
|   target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB) |   target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB) | ||||||
| @@ -289,10 +285,14 @@ if (IXWEBSOCKET_INSTALL) | |||||||
|           PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket/ |           PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket/ | ||||||
|   ) |   ) | ||||||
|  |  | ||||||
|  |   configure_file("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket-config.cmake.in" "${CMAKE_BINARY_DIR}/ixwebsocket-config.cmake" @ONLY) | ||||||
|  |   install(FILES "${CMAKE_BINARY_DIR}/ixwebsocket-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket") | ||||||
|  |    | ||||||
|   install(EXPORT ixwebsocket |   install(EXPORT ixwebsocket | ||||||
|           FILE ixwebsocket-config.cmake |           FILE ixwebsocket-targets.cmake | ||||||
|           NAMESPACE ixwebsocket:: |           NAMESPACE ixwebsocket:: | ||||||
|           DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket) |           DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket | ||||||
|  |   ) | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
| if (USE_WS OR USE_TEST) | if (USE_WS OR USE_TEST) | ||||||
|   | |||||||
							
								
								
									
										9
									
								
								ixwebsocket-config.cmake.in
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								ixwebsocket-config.cmake.in
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | @PACKAGE_INIT@ | ||||||
|  |  | ||||||
|  | include(CMakeFindDependencyMacro) | ||||||
|  |  | ||||||
|  | if(@USE_ZLIB@) | ||||||
|  |   find_dependency(ZLIB) | ||||||
|  | endif() | ||||||
|  |  | ||||||
|  | include("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket-targets.cmake") | ||||||
		Reference in New Issue
	
	Block a user