Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/stdlib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function(configure_stdlib_target target_name regular_sources_var fypp_files_var
list(APPEND all_sources ${${regular_sources_var}})

add_library(${target_name} ${all_sources})
add_library(${PROJECT_NAME}::${target_name} ALIAS ${target_name})
#add_library(${PROJECT_NAME}::${target_name} ALIAS ${target_name})

set_target_properties(
${target_name}
Expand Down
36 changes: 21 additions & 15 deletions config/cmake/Findtest-drive.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,19 @@ foreach(method ${${_pkg}_FIND_METHOD})
if("${_pkg}_FOUND")
message(STATUS "Found ${_lib} via pkg-config")

add_library("${_lib}::${_lib}" INTERFACE IMPORTED)
target_link_libraries(
"${_lib}::${_lib}"
INTERFACE
"${${_pkg}_LINK_LIBRARIES}"
)
target_include_directories(
"${_lib}::${_lib}"
INTERFACE
"${${_pkg}_INCLUDE_DIRS}"
)
if(NOT TARGET "${_lib}::${_lib}")
add_library("${_lib}::${_lib}" INTERFACE IMPORTED)
target_link_libraries(
"${_lib}::${_lib}"
INTERFACE
"${${_pkg}_LINK_LIBRARIES}"
)
target_include_directories(
"${_lib}::${_lib}"
INTERFACE
"${${_pkg}_INCLUDE_DIRS}"
)
endif()

break()
endif()
Expand All @@ -118,8 +120,10 @@ foreach(method ${${_pkg}_FIND_METHOD})
"${${_pkg}_BINARY_DIR}"
)

add_library("${_lib}::${_lib}" INTERFACE IMPORTED)
target_link_libraries("${_lib}::${_lib}" INTERFACE "${_lib}")
if(NOT TARGET "${_lib}::${_lib}")
add_library("${_lib}::${_lib}" INTERFACE IMPORTED)
target_link_libraries("${_lib}::${_lib}" INTERFACE "${_lib}")
endif()

# We need the module directory in the subproject before we finish the configure stage
if(NOT EXISTS "${${_pkg}_BINARY_DIR}/include")
Expand All @@ -140,8 +144,10 @@ foreach(method ${${_pkg}_FIND_METHOD})
)
FetchContent_MakeAvailable("${_lib}")

add_library("${_lib}::${_lib}" INTERFACE IMPORTED)
target_link_libraries("${_lib}::${_lib}" INTERFACE "${_lib}")
if(NOT TARGET "${_lib}::${_lib}")
add_library("${_lib}::${_lib}" INTERFACE IMPORTED)
target_link_libraries("${_lib}::${_lib}" INTERFACE "${_lib}")
endif()

# We need the module directory in the subproject before we finish the configure stage
FetchContent_GetProperties("${_lib}" SOURCE_DIR "${_pkg}_SOURCE_DIR")
Expand Down
Loading