direct imports / highfive full inc path

Author: PhilipDeegan

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")

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}")
 

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}")

src/core/errors.hpp

@@ -9,7 +9,7 @@
 #include <unordered_map>
 
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 
 namespace PHARE::core

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>
 

src/diagnostic/diagnostic_props.hpp

@@ -6,7 +6,7 @@
 #include <vector>
 #include <cstddef>
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 namespace PHARE::diagnostic
 {

src/diagnostic/diagnostics.hpp

@@ -18,7 +18,7 @@
 
 #include "diagnostic_manager.hpp"
 
-#include "cppdict/include/dict.hpp"
+#include "dict.hpp"
 
 #if PHARE_HAS_HIGHFIVE
 

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)

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"
 

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"