From 82adc3b4109a13fdbdff89aeb5808faa625b80eb Mon Sep 17 00:00:00 2001 From: Arthur Sonzogni Date: Tue, 6 Jul 2021 02:10:35 +0200 Subject: [PATCH] Rename library for vcpkg. (#140) Instead of putting the archive as: - /ftxui/libcomponent.a - /ftxui/libdom.a - /ftxui/libscreen.a Use: - /libftxui-component.a - /libftxui-dom.a - /libftxui-screen.a This fixes an issue users have with VCPKG. See: https://github.com/microsoft/vcpkg/issues/16327#issuecomment-868942370 --- cmake/ftxui_install.cmake | 4 ++-- cmake/ftxui_set_options.cmake | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/ftxui_install.cmake b/cmake/ftxui_install.cmake index 8977814..a3aacee 100644 --- a/cmake/ftxui_install.cmake +++ b/cmake/ftxui_install.cmake @@ -1,8 +1,8 @@ include(GNUInstallDirs) install(TARGETS screen dom component EXPORT ftxui-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/ftxui/ - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/ftxui/ + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(DIRECTORY include/ftxui DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/cmake/ftxui_set_options.cmake b/cmake/ftxui_set_options.cmake index 682138c..ecc42c9 100644 --- a/cmake/ftxui_set_options.cmake +++ b/cmake/ftxui_set_options.cmake @@ -1,4 +1,7 @@ function(ftxui_set_options library) + set_target_properties(${library} PROPERTIES PREFIX "ftxui-") + + target_include_directories(${library} PUBLIC $