Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pugixml,cmake: fix linkage when pugixml is external #4142

Merged
merged 1 commit into from
Apr 21, 2024
Merged

pugixml,cmake: fix linkage when pugixml is external #4142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions source/adios2/toolkit/remote/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@
if (NOT ADIOS2_USE_PIP)
add_executable(adios2_remote_server ./remote_server.cpp remote_common.cpp)

target_link_libraries(adios2_remote_server PUBLIC EVPath::EVPath adios2_core adios2sys
PRIVATE $<$<PLATFORM_ID:Windows>:shlwapi>)
target_link_libraries(adios2_remote_server
PUBLIC EVPath::EVPath adios2_core adios2sys
PRIVATE adios2::thirdparty::pugixml $<$<PLATFORM_ID:Windows>:shlwapi>)

get_property(pugixml_headers_path
TARGET pugixml
PROPERTY INTERFACE_INCLUDE_DIRECTORIES
)

target_include_directories(adios2_remote_server PRIVATE ${PROJECT_BINARY_DIR} ${pugixml_headers_path})
target_include_directories(adios2_remote_server PRIVATE ${PROJECT_BINARY_DIR})

set_property(TARGET adios2_remote_server PROPERTY OUTPUT_NAME adios2_remote_server${ADIOS2_EXECUTABLE_SUFFIX})
install(TARGETS adios2_remote_server EXPORT adios2
Expand Down
8 changes: 1 addition & 7 deletions source/utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,11 @@ configure_file(
add_executable(bpls ./bpls/bpls.cpp)
target_link_libraries(bpls
PUBLIC adios2_core adios2sys
PRIVATE $<$<PLATFORM_ID:Windows>:shlwapi>)

get_property(pugixml_headers_path
TARGET pugixml
PROPERTY INTERFACE_INCLUDE_DIRECTORIES
)
PRIVATE adios2::thirdparty::pugixml $<$<PLATFORM_ID:Windows>:shlwapi>)

target_include_directories(bpls PRIVATE
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}/bindings/C
${pugixml_headers_path}
)

set_property(TARGET bpls PROPERTY OUTPUT_NAME bpls${ADIOS2_EXECUTABLE_SUFFIX})
Expand Down
Loading