direct imports / highfive full inc path

PhilipDeegan · PhilipDeegan · commit 34fed8d9991a · 2025-11-21T08:41:36.000+01:00
diff --git a/res/cmake/dep/highfive.cmake b/res/cmake/dep/highfive.cmake
@@ -15,6 +15,7 @@ if(HighFive)
   set(HIGHFIVE_USE_BOOST OFF)
   set(HIGHFIVE_BUILD_DOCS OFF) # conflicts with phare doc target
   set(HIGHFIVE_EXAMPLES OFF)
+  include_directories(${HIGHFIVE_SRC}/include)
   add_subdirectory(${HIGHFIVE_SRC})
 
   message("HighFive enabled - checking HDF5")
diff --git a/src/amr/CMakeLists.txt b/src/amr/CMakeLists.txt
@@ -99,6 +99,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
   SAMRAI_tbox
   SAMRAI_xfer
   MPI::MPI_C
+  cppdict
   )
 set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " ${PHARE_LINK_FLAGS}")
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -63,7 +63,7 @@ endif(withPhlop)
 
 add_library(${PROJECT_NAME}  ${SOURCES_INC} ${SOURCES_CPP} ${CORE_EXTRA_SOURCES_CPP} )
 target_compile_options(${PROJECT_NAME}  PRIVATE ${PHARE_WERROR_FLAGS})
-target_link_libraries(${PROJECT_NAME}  PRIVATE phare_initializer MPI::MPI_C
+target_link_libraries(${PROJECT_NAME}  PRIVATE phare_initializer MPI::MPI_C cppdict
     PUBLIC ${PHARE_BASE_LIBS}
   )
 
@@ -73,6 +73,4 @@ if (NOT phare_configurator)
 endif()
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY INTERPROCEDURAL_OPTIMIZATION ${PHARE_INTERPROCEDURAL_OPTIMIZATION})
-target_include_directories(${PROJECT_NAME}  PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../subprojects>)
 set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " ${PHARE_LINK_FLAGS}")
diff --git a/src/core/errors.hpp b/src/core/errors.hpp
@@ -9,7 +9,7 @@
 #include <unordered_map>
 
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 
 namespace PHARE::core
diff --git a/src/core/utilities/types.hpp b/src/core/utilities/types.hpp
@@ -17,7 +17,7 @@
 #include <vector>
 
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 
 
diff --git a/src/diagnostic/diagnostic_model_view.hpp b/src/diagnostic/diagnostic_model_view.hpp
@@ -9,7 +9,7 @@
 #include "amr/messengers/field_sum_transaction.hpp"
 #include "amr/data/field/field_variable_fill_pattern.hpp"
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 #include <SAMRAI/xfer/RefineAlgorithm.h>
 
diff --git a/src/diagnostic/diagnostic_props.hpp b/src/diagnostic/diagnostic_props.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 #include <cstddef>
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 namespace PHARE::diagnostic
 {
diff --git a/src/diagnostic/diagnostic_writer.hpp b/src/diagnostic/diagnostic_writer.hpp
@@ -3,7 +3,7 @@
 
 #include "diagnostic_props.hpp"
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 namespace PHARE::diagnostic
 {
diff --git a/src/diagnostic/diagnostics.hpp b/src/diagnostic/diagnostics.hpp
@@ -18,7 +18,7 @@
 
 #include "diagnostic_manager.hpp"
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 #if PHARE_HAS_HIGHFIVE
 
diff --git a/src/initializer/CMakeLists.txt b/src/initializer/CMakeLists.txt
@@ -14,13 +14,11 @@ set(SOURCE_CPP data_provider.cpp)
 set(PYBIND11_CPP_STANDARD -std=c++17)
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP} ${SOURCE_INC})
+target_link_libraries(${PROJECT_NAME} PUBLIC cppdict)
 target_compile_options(${PROJECT_NAME} PRIVATE ${PHARE_WERROR_FLAGS})
 set_property(TARGET ${PROJECT_NAME} PROPERTY INTERPROCEDURAL_OPTIMIZATION ${PHARE_INTERPROCEDURAL_OPTIMIZATION})
 set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " ${PHARE_LINK_FLAGS}")
 
-target_include_directories(${PROJECT_NAME}  PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../subprojects>)
-
 
 # this is the python module that wraps the add() method
 pybind11_add_module(dictator dictator.cpp)
diff --git a/src/initializer/data_provider.hpp b/src/initializer/data_provider.hpp
@@ -7,7 +7,7 @@
 #include <optional>
 #include <functional>
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 #include "core/def.hpp"
 #include "core/utilities/span.hpp"
 
diff --git a/src/initializer/dictator.cpp b/src/initializer/dictator.cpp
@@ -1,5 +1,5 @@
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 #include "initializer/python_data_provider.hpp"
 
 #include "python3/pybind_def.hpp"
diff --git a/src/phare_core.hpp b/src/phare_core.hpp
@@ -15,7 +15,7 @@
 
 #include "phare_simulator_options.hpp"
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 #include <string>
 #include <functional>
diff --git a/src/python3/data_wrangler.hpp b/src/python3/data_wrangler.hpp
@@ -14,7 +14,7 @@
 
 #include "simulator/simulator.hpp"
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 #include <array>
 #include <memory>
diff --git a/src/restarts/restarts_props.hpp b/src/restarts/restarts_props.hpp
@@ -1,10 +1,9 @@
 #ifndef RESTART_DAO_HPP
 #define RESTART_DAO_HPP
 
-#include <string>
 #include <vector>
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 namespace PHARE::restarts
 {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC`
`99`	`99`	`SAMRAI_tbox`
`100`	`100`	`SAMRAI_xfer`
`101`	`101`	`MPI::MPI_C`
	`102`	`+ cppdict`
`102`	`103`	`)`
`103`	`104`	`set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " ${PHARE_LINK_FLAGS}")`
`104`	`105`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#include <vector>`
`18`	`18`
`19`	`19`
`20`		`-#include "cppdict/include/dict.hpp"`
	`20`	`+#include "dict.hpp"`
`21`	`21`
`22`	`22`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include <vector>`
`7`	`7`	`#include <cstddef>`
`8`	`8`
`9`		`-#include "cppdict/include/dict.hpp"`
	`9`	`+#include "dict.hpp"`
`10`	`10`
`11`	`11`	`namespace PHARE::diagnostic`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "diagnostic_props.hpp"`
`5`	`5`
`6`		`-#include "cppdict/include/dict.hpp"`
	`6`	`+#include "dict.hpp"`
`7`	`7`
`8`	`8`	`namespace PHARE::diagnostic`
`9`	`9`	`{`