cmake: remove redundant pugixml dependency

ornladios · Aug 14, 2023 · 006c0cd · 006c0cd
1 parent 74c46f3
commit 006c0cd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/bindings/CXX11/CMakeLists.txt b/bindings/CXX11/CMakeLists.txt
@@ -24,7 +24,7 @@ add_library(adios2_cxx11
 
 set_property(TARGET adios2_cxx11 PROPERTY EXPORT_NAME cxx11)
 set_property(TARGET adios2_cxx11 PROPERTY OUTPUT_NAME adios2${ADIOS2_LIBRARY_SUFFIX}_cxx11)
-target_link_libraries(adios2_cxx11 PRIVATE adios2_core adios2::thirdparty::pugixml)
+target_link_libraries(adios2_cxx11 PRIVATE adios2_core)
 target_compile_features(adios2_cxx11 INTERFACE ${ADIOS2_CXX11_FEATURES})
 
 target_include_directories(adios2_cxx11

diff --git a/source/adios2/toolkit/remote/CMakeLists.txt b/source/adios2/toolkit/remote/CMakeLists.txt
@@ -5,15 +5,17 @@
 
 add_executable(remote_server ./remote_server.cpp remote_common.cpp)
 
-target_link_libraries(remote_server
-		      PUBLIC EVPath::EVPath
-                      PUBLIC adios2_core adios2sys
-                      PRIVATE adios2::thirdparty::pugixml $<$<PLATFORM_ID:Windows>:shlwapi>)
-target_include_directories(remote_server PRIVATE ${PROJECT_BINARY_DIR})
+target_link_libraries(remote_server PUBLIC EVPath::EVPath adios2_core adios2sys
+  PRIVATE $<$<PLATFORM_ID:Windows>:shlwapi>)
+
+get_property(pugixml_headers_path
+  TARGET pugixml
+  PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+)
+
+target_include_directories(remote_server PRIVATE ${PROJECT_BINARY_DIR} ${pugixml_headers_path})
 
 set_property(TARGET remote_server PROPERTY OUTPUT_NAME remote_server${ADIOS2_EXECUTABLE_SUFFIX})
 install(TARGETS remote_server EXPORT adios2
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT adios2_tools-runtime
 )
-
-
diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt
@@ -13,8 +13,19 @@ configure_file(
 add_executable(bpls ./bpls/bpls.cpp)
 target_link_libraries(bpls
                       PUBLIC adios2_core adios2sys
-                      PRIVATE adios2::thirdparty::pugixml $<$<PLATFORM_ID:Windows>:shlwapi>)
-target_include_directories(bpls PRIVATE ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/bindings/C)
+                      PRIVATE $<$<PLATFORM_ID:Windows>:shlwapi>)
+
+get_property(pugixml_headers_path
+  TARGET pugixml
+  PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+)
+
+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})
 install(TARGETS bpls EXPORT adios2
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT adios2_tools-runtime