Fix extern variable in Windows

robotology · Jul 26, 2019 · 724c934 · 724c934
1 parent 637c262
commit 724c934
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/sources/Core/CMakeLists.txt b/sources/Core/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(CORE_SRC
  src/Block.cpp
- src/BlockInformation.cpp
  src/Log.cpp
  src/Parameter.cpp
  src/Parameters.cpp

diff --git a/sources/Core/include/BlockFactory/Core/BlockInformation.h b/sources/Core/include/BlockFactory/Core/BlockInformation.h
@@ -27,8 +27,9 @@ namespace blockfactory {
  using OutputPortsInfo = std::vector<Port::Info>;
  using InputSignalPtr = std::shared_ptr<const blockfactory::core::Signal>;
  using OutputSignalPtr = std::shared_ptr<blockfactory::core::Signal>;
- // List of possible key for defining block options:
- extern const std::string BlockOptionPrioritizeOrder;
+
+ // List of possible keys for defining block options:
+ const std::string BlockOptionPrioritizeOrder = "wbt.BlockOptionPrioritizeOrder";
  } // namespace core
 } // namespace blockfactory
 

diff --git a/sources/Core/src/BlockInformation.cpp b/sources/Core/src/BlockInformation.cpp