From 6d207e87d3a6b16f3f2bd87a44ed32642aba5d4f Mon Sep 17 00:00:00 2001 From: black-desk Date: Mon, 29 Jan 2024 17:28:34 +0800 Subject: [PATCH] fix: upgrade PFL to fix export name Signed-off-by: black-desk --- cmake/PFL.cmake | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/cmake/PFL.cmake b/cmake/PFL.cmake index 0bd7fb4..7d987cb 100644 --- a/cmake/PFL.cmake +++ b/cmake/PFL.cmake @@ -26,7 +26,7 @@ function(pfl_init) cmake_parse_arguments(PFL_INIT "" "INSTALL;ENABLE_TESTING;BUILD_EXAMPLES" "EXTERNALS" ${ARGN}) - message(STATUS "PFL: --==Version: v0.2.6==--") + message(STATUS "PFL: --==Version: v0.2.8==--") set(PFL_ENABLE_TESTING ${PFL_INIT_ENABLE_TESTING} @@ -37,6 +37,10 @@ function(pfl_init) set(PFL_INSTALL ${PFL_INIT_INSTALL} PARENT_SCOPE) + set(PFL_PREFIX + ${PROJECT_NAME} + PARENT_SCOPE) + foreach(EXTERNAL ${PFL_INIT_EXTERNALS}) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/external/${EXTERNAL}) endforeach() @@ -173,18 +177,17 @@ function(pfl_add_library) if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") set(TARGET_DIR_NAME ${PROJECT_NAME}) + if(NOT PFL_ADD_LIBRARY_OUTPUT_NAME) + set(PFL_ADD_LIBRARY_OUTPUT_NAME ${PROJECT_NAME}) + endif() endif() string(REPLACE " " "_" TARGET_NAME "${TARGET_DIR_NAME}") string(REPLACE "::" "__" TARGET_PREFIX "${PFL_PREFIX}") - if(TARGET_PREFIX) - set(TARGET_NAME "${TARGET_PREFIX}__${TARGET_NAME}") - string(REPLACE "__" "::" TARGET_EXPORT_NAME "${TARGET_NAME}") - else() - set(TARGET_EXPORT_NAME "${TARGET_DIR_NAME}::${TARGET_NAME}") - endif() + set(TARGET_NAME "${TARGET_PREFIX}__${TARGET_NAME}") + string(REPLACE "__" "::" TARGET_EXPORT_NAME "${TARGET_NAME}") message( STATUS