BRAYNS 524 - Update libsonata to 0.1.17 (#1163)

BlueBrain · Feb 23, 2023 · a21c8a8 · a21c8a8
1 parent fafa733
commit a21c8a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/plugins/CircuitExplorer/io/sonataloader/data/Config.cpp b/plugins/CircuitExplorer/io/sonataloader/data/Config.cpp
@@ -42,7 +42,7 @@ struct MorphologyFormat
 class MorphologyPathResolver
 {
 public:
-    static std::string getFormatPath(const bbp::sonata::PopulationProperties &params, const std::string &format)
+    static std::string getFormatPath(const bbp::sonata::NodePopulationProperties &params, const std::string &format)
     {
         if (format == MorphologyFormat::swc)
         {
@@ -160,7 +160,7 @@ bbp::sonata::NodePopulation Config::getNodes(const std::string &name) const
     return _config.getNodePopulation(name);
 }
 
-bbp::sonata::PopulationProperties Config::getNodesProperties(const std::string &name) const
+bbp::sonata::NodePopulationProperties Config::getNodesProperties(const std::string &name) const
 {
     return _config.getNodePopulationProperties(name);
 }
@@ -175,7 +175,7 @@ bbp::sonata::EdgePopulation Config::getEdges(const std::string &name) const
     return _config.getEdgePopulation(name);
 }
 
-bbp::sonata::PopulationProperties Config::getEdgesProperties(const std::string &name) const
+bbp::sonata::EdgePopulationProperties Config::getEdgesProperties(const std::string &name) const
 {
     return _config.getEdgePopulationProperties(name);
 }

diff --git a/plugins/CircuitExplorer/io/sonataloader/data/Config.h b/plugins/CircuitExplorer/io/sonataloader/data/Config.h
@@ -76,7 +76,7 @@ class Config
      * @param name Name of the node population.
      * @return bbp::sonata::PopulationProperties
      */
-    bbp::sonata::PopulationProperties getNodesProperties(const std::string &name) const;
+    bbp::sonata::NodePopulationProperties getNodesProperties(const std::string &name) const;
 
     /**
      * @brief Return the name of all node populations in the network.
@@ -96,7 +96,7 @@ class Config
      * @param name Name of the edge population.
      * @return bbp::sonata::PopulationProperties
      */
-    bbp::sonata::PopulationProperties getEdgesProperties(const std::string &name) const;
+    bbp::sonata::EdgePopulationProperties getEdgesProperties(const std::string &name) const;
 
     /**
      * @brief Returns any available path to the directory containing the population morphologies.

diff --git a/plugins/deps/CMakeLists.txt b/plugins/deps/CMakeLists.txt
@@ -17,7 +17,7 @@ if(BRAYNS_CIRCUITEXPLORER_ENABLED OR BRAYNS_DTI_ENABLED AND NOT sonata_FOUND AND
         FetchContent_Declare(
             libsonata
             GIT_REPOSITORY https://github.com/BlueBrain/libsonata.git
-            GIT_TAG v0.1.16
+            GIT_TAG v0.1.17
             GIT_SHALLOW OFF # Required for its own CMakeLists.txt not to fail
             GIT_SUBMODULES_RECURSE ON
             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libsonata
@@ -27,6 +27,10 @@ if(BRAYNS_CIRCUITEXPLORER_ENABLED OR BRAYNS_DTI_ENABLED AND NOT sonata_FOUND AND
 
     set(EXTLIB_FROM_SUBMODULES ON CACHE BOOL "" FORCE)
     set(SONATA_TESTS OFF CACHE BOOL "" FORCE)
+
+    # Force C++14 for GCC < 12.2.0
+    set(CMAKE_CXX_STANDARD 14 CACHE STRING "" FORCE)
+
     add_subdirectory(libsonata)
     add_library(sonata::sonata_shared ALIAS sonata_shared)
 endif()