58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
From f1322a322cb1e5739742c405fe329b4a07820ade Mon Sep 17 00:00:00 2001
|
|
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
|
|
Date: Wed, 17 Apr 2024 14:22:40 -0400
|
|
Subject: [PATCH] pugixml,cmake: fix linkage when pugixml is external
|
|
|
|
---
|
|
source/adios2/toolkit/remote/CMakeLists.txt | 12 ++++--------
|
|
source/utils/CMakeLists.txt | 8 +-------
|
|
2 files changed, 5 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/source/adios2/toolkit/remote/CMakeLists.txt b/source/adios2/toolkit/remote/CMakeLists.txt
|
|
index a739e1ad63..fdea6ec841 100644
|
|
--- a/source/adios2/toolkit/remote/CMakeLists.txt
|
|
+++ b/source/adios2/toolkit/remote/CMakeLists.txt
|
|
@@ -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
|
|
diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt
|
|
index 30dd48411f..01f5f93c34 100644
|
|
--- a/source/utils/CMakeLists.txt
|
|
+++ b/source/utils/CMakeLists.txt
|
|
@@ -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})
|