mirror of
				https://github.com/ArthurSonzogni/FTXUI.git
				synced 2025-10-31 10:38:09 +08:00 
			
		
		
		
	build: Properly escape paths which may contain spaces
This commit is contained in:
		 Henrik S. Gaßmann
					Henrik S. Gaßmann
				
			
				
					committed by
					
						 ArthurSonzogni
						ArthurSonzogni
					
				
			
			
				
	
			
			
			 ArthurSonzogni
						ArthurSonzogni
					
				
			
						parent
						
							3483022703
						
					
				
				
					commit
					f64e1e128e
				
			| @@ -4,5 +4,5 @@ add_library(ftxui::component ALIAS component) | |||||||
| export( | export( | ||||||
|   TARGETS screen dom component |   TARGETS screen dom component | ||||||
|   NAMESPACE ftxui:: |   NAMESPACE ftxui:: | ||||||
|   FILE ${PROJECT_BINARY_DIR}/ftxui-targets.cmake |   FILE "${PROJECT_BINARY_DIR}/ftxui-targets.cmake" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ set(BUILD_GMOCK OFF CACHE INTERNAL "") | |||||||
| set(INSTALL_GTEST OFF CACHE INTERNAL "") | set(INSTALL_GTEST OFF CACHE INTERNAL "") | ||||||
| set(gtest_force_shared_crt ON CACHE INTERNAL "") | set(gtest_force_shared_crt ON CACHE INTERNAL "") | ||||||
| add_subdirectory( | add_subdirectory( | ||||||
|   ${googletest_SOURCE_DIR} |   "${googletest_SOURCE_DIR}" | ||||||
|   ${googletest_BINARY_DIR} |   "${googletest_BINARY_DIR}" | ||||||
|   EXCLUDE_FROM_ALL |   EXCLUDE_FROM_ALL | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ install( | |||||||
|  |  | ||||||
| install( | install( | ||||||
|   DIRECTORY include/ftxui |   DIRECTORY include/ftxui | ||||||
|   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | ||||||
|   ) |   ) | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
| @@ -24,7 +24,7 @@ install( | |||||||
| install( | install( | ||||||
|   EXPORT ftxui-targets |   EXPORT ftxui-targets | ||||||
|   NAMESPACE ftxui:: |   NAMESPACE ftxui:: | ||||||
|   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ftxui |   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ftxui" | ||||||
|   ) |   ) | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
| @@ -32,21 +32,21 @@ install( | |||||||
| # needed to support users of find_package() | # needed to support users of find_package() | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
| configure_package_config_file( | configure_package_config_file( | ||||||
|   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ftxui-config.cmake.in |   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ftxui-config.cmake.in" | ||||||
|   ${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config.cmake |   "${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config.cmake" | ||||||
|   INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/ftxui/cmake |   INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/ftxui/cmake" | ||||||
|   PATH_VARS CMAKE_INSTALL_INCLUDEDIR |   PATH_VARS CMAKE_INSTALL_INCLUDEDIR | ||||||
|   ) |   ) | ||||||
| write_basic_package_version_file( | write_basic_package_version_file( | ||||||
|   ${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config-version.cmake |   "${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config-version.cmake" | ||||||
|   VERSION ${PACKAGE_VERSION} |   VERSION ${PACKAGE_VERSION} | ||||||
|   COMPATIBILITY SameMajorVersion |   COMPATIBILITY SameMajorVersion | ||||||
|   ) |   ) | ||||||
| install( | install( | ||||||
|   FILES |   FILES | ||||||
|   ${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config.cmake |   "${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config.cmake" | ||||||
|   ${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config-version.cmake |   "${CMAKE_CURRENT_BINARY_DIR}/cmake/ftxui-config-version.cmake" | ||||||
|   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ftxui |   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ftxui" | ||||||
|   ) |   ) | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
| @@ -55,6 +55,6 @@ install( | |||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
| configure_file(ftxui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/ftxui.pc @ONLY) | configure_file(ftxui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/ftxui.pc @ONLY) | ||||||
| install( | install( | ||||||
|   FILES ${CMAKE_CURRENT_BINARY_DIR}/ftxui.pc |   FILES "${CMAKE_CURRENT_BINARY_DIR}/ftxui.pc" | ||||||
|   DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" |   DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" | ||||||
|   ) |   ) | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| find_program(iwyu_path NAMES include-what-you-use iwyu) | find_program(iwyu_path NAMES include-what-you-use iwyu) | ||||||
| if(iwyu_path) | if(iwyu_path) | ||||||
|   set_property(TARGET ${lib} |   set_property(TARGET ${lib} | ||||||
|     PROPERTY ${iwyu_path} -Xiwyu |     PROPERTY "${iwyu_path}" -Xiwyu | ||||||
|       --mapping_file ${CMAKE_CURRENT_SOURCE_DIR}/iwyu.imp |       --mapping_file "${CMAKE_CURRENT_SOURCE_DIR}/iwyu.imp" | ||||||
|   ) |   ) | ||||||
| endif() | endif() | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user