fix: lanelet2_io and lanelet2_projection static link

wu-vincent · Nov 27, 2023 · 219e3de · 219e3de
1 parent 31d3a91
commit 219e3de
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 23 deletions.
diff --git a/lanelet2_core/src/BasicRegulatoryElements.cpp b/lanelet2_core/src/BasicRegulatoryElements.cpp
@@ -152,11 +152,6 @@ RegulatoryElementDataPtr constructAllWayStopData(Id id, const AttributeMap& attr
 }
 }  // namespace
 
-static RegisterRegulatoryElement<TrafficLight> regTraffic;
-static RegisterRegulatoryElement<RightOfWay> regRightOfWay;
-static RegisterRegulatoryElement<TrafficSign> regTrafficSign;
-static RegisterRegulatoryElement<SpeedLimit> regSpeedLimit;
-static RegisterRegulatoryElement<AllWayStop> regAllWayStop;
 #if __cplusplus < 201703L
 constexpr char TrafficLight::RuleName[];
 constexpr char RightOfWay::RuleName[];

diff --git a/lanelet2_core/src/RegulatoryElement.cpp b/lanelet2_core/src/RegulatoryElement.cpp
@@ -85,6 +85,12 @@ class ToConstVisitor : public RuleParameterVisitor {
 }  // namespace
 
 static RegisterRegulatoryElement<GenericRegulatoryElement> genRegelem;
+static RegisterRegulatoryElement<TrafficLight> regTraffic;
+static RegisterRegulatoryElement<RightOfWay> regRightOfWay;
+static RegisterRegulatoryElement<TrafficSign> regTrafficSign;
+static RegisterRegulatoryElement<SpeedLimit> regSpeedLimit;
+static RegisterRegulatoryElement<AllWayStop> regAllWayStop;
+
 #if __cplusplus < 201703L
 constexpr char GenericRegulatoryElement::RuleName[];
 

diff --git a/lanelet2_io/CMakeLists.txt b/lanelet2_io/CMakeLists.txt
@@ -50,14 +50,14 @@ if (NOT BUILD_TESTING STREQUAL OFF)
     include(GoogleTest)
     file(GLOB PROJECT_SOURCE_FILES_TEST "${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp")
     add_executable("${PROJECT_NAME}_test" ${PROJECT_SOURCE_FILES_TEST})
+    target_compile_definitions("${PROJECT_NAME}_test" PRIVATE -DPKG_DIR="${CMAKE_CURRENT_LIST_DIR}")
     target_link_libraries("${PROJECT_NAME}_test" PRIVATE GTest::gtest_main ${PROJECT_NAME})
 
-    if (WIN32)
+    if (WIN32 AND BUILD_SHARED_LIBS)
         add_custom_command(TARGET "${PROJECT_NAME}_test" POST_BUILD
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_RUNTIME_DLLS:${PROJECT_NAME}_test>" "$<TARGET_FILE_DIR:${PROJECT_NAME}_test>"
                 COMMAND_EXPAND_LISTS)
     endif ()
 
     gtest_discover_tests("${PROJECT_NAME}_test")
-    add_dependencies("${PROJECT_NAME}_test" lanelet2_maps)
 endif ()
diff --git a/lanelet2_io/src/BinHandler.cpp b/lanelet2_io/src/BinHandler.cpp
@@ -5,19 +5,11 @@
 #include <fstream>
 
 #include "lanelet2_io/Exceptions.h"
-#include "lanelet2_io/io_handlers/Factory.h"
 #include "lanelet2_io/io_handlers/Serialize.h"
 
 namespace lanelet {
 namespace io_handlers {
 
-namespace {
-// register with factories
-RegisterParser<BinParser> regParser;
-RegisterWriter<BinWriter> regWriter;
-
-}  // namespace
-
 void BinWriter::write(const std::string& filename, const LaneletMap& laneletMap, ErrorMessages& /*errors*/,
                       const io::Configuration& /*params*/) const {
   std::ofstream fs(filename, std::ofstream::binary);

diff --git a/lanelet2_io/src/Factory.cpp b/lanelet2_io/src/Factory.cpp
@@ -1,10 +1,18 @@
 #include "lanelet2_io/io_handlers/Factory.h"
 
 #include "lanelet2_io/Exceptions.h"
+#include "lanelet2_io/io_handlers/BinHandler.h"
+#include "lanelet2_io/io_handlers/OsmHandler.h"
 
 namespace lanelet {
 namespace io_handlers {
 namespace {
+// register with factories
+RegisterParser<BinParser> regBinParser;
+RegisterWriter<BinWriter> regBinWriter;
+RegisterParser<OsmParser> regOsmParser;
+RegisterWriter<OsmWriter> regOsmWriter;
+
 std::string format(const std::vector<std::string>& strings, const std::string& delim = ", ") {
   std::string formatted;
   for (const auto& str : strings) {

diff --git a/lanelet2_io/src/OsmHandlerLoad.cpp b/lanelet2_io/src/OsmHandlerLoad.cpp
@@ -20,8 +20,6 @@ namespace io_handlers {
 using Errors = std::vector<std::string>;
 
 namespace {
-// register with factories
-RegisterParser<OsmParser> regParser;
 using traits::to2D;
 bool isValid(const LineStrings3d& lss) {
   BasicPolygon2d ls(utils::concatenate(lss, [](const auto& elem) { return to2D(elem).basicLineString(); }));

diff --git a/lanelet2_io/src/OsmHandlerWrite.cpp b/lanelet2_io/src/OsmHandlerWrite.cpp
@@ -13,9 +13,6 @@ namespace io_handlers {
 
 using Errors = std::vector<std::string>;
 namespace {
-// register with factories
-RegisterWriter<OsmWriter> regWriter;
-
 struct UnresolvedRole {
   Id relationId{};
   Id referencedRoleId{};

diff --git a/lanelet2_io/test/TestBinHandler.cpp b/lanelet2_io/test/TestBinHandler.cpp
@@ -2,6 +2,7 @@
 #include <boost/archive/binary_oarchive.hpp>
 #include <cstdio>
 #include <fstream>
+#include <string>
 
 #include "TestSetup.h"
 #include "gtest/gtest.h"
@@ -115,7 +116,7 @@ TEST(BinHandler, explicitIO) {  // NOLINT
 
 TEST(BinHandler, fullMap) {
   Origin origin({49, 8.4, 0});
-  std::string filenameIn = "../lanelet2_maps/res/mapping_example.osm";
+  std::string filenameIn = std::string(PKG_DIR) + "/../lanelet2_maps/res/mapping_example.osm";
   auto map = lanelet::load(filenameIn, origin);
   auto llt = map->laneletLayer.find(44968);
   writeAndLoad(*llt);

diff --git a/lanelet2_io/test/TestSimpleUsage.cpp b/lanelet2_io/test/TestSimpleUsage.cpp
@@ -5,7 +5,7 @@
 TEST(lanelet2_io, exampleUsage) {  // NOLINT
   using namespace lanelet;
   Origin origin({49, 8.4, 0});
-  std::string filenameIn = "../lanelet2_maps/res/mapping_example.osm";
+  std::string filenameIn = std::string(PKG_DIR) + "/../lanelet2_maps/res/mapping_example.osm";
   LaneletMapPtr laneletMap = lanelet::load(filenameIn, origin);
 
   lanelet::test_setup::Tempfile file("file.osm");

diff --git a/lanelet2_projection/CMakeLists.txt b/lanelet2_projection/CMakeLists.txt
@@ -51,7 +51,7 @@ if (NOT BUILD_TESTING STREQUAL OFF)
     add_executable("${PROJECT_NAME}_test" ${PROJECT_SOURCE_FILES_TEST})
     target_link_libraries("${PROJECT_NAME}_test" PRIVATE GTest::gtest_main ${PROJECT_NAME})
 
-    if (WIN32)
+    if (WIN32 AND BUILD_SHARED_LIBS)
         add_custom_command(TARGET "${PROJECT_NAME}_test" POST_BUILD
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_RUNTIME_DLLS:${PROJECT_NAME}_test>" "$<TARGET_FILE_DIR:${PROJECT_NAME}_test>"
                 COMMAND_EXPAND_LISTS)