👩‍🌾 Make Windows 🟢 (#107)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Aug 25, 2020 · 987c333 · 987c333
1 parent 0571f4a
commit 987c333
Show file tree

Hide file tree

Showing 31 changed files with 630 additions and 266 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -3,7 +3,6 @@ libcurl4-openssl-dev
 libgflags-dev
 libignition-cmake2-dev
 libignition-common3-dev
-libignition-math4-dev
 libignition-tools-dev
 libjsoncpp-dev
 libtinyxml2-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,8 @@ project(ignition-fuel_tools3 VERSION 3.4.0)
 # Find ignition-cmake
 #============================================================================
 # If you get an error at this line, you need to install ignition-cmake
-find_package(ignition-cmake2 REQUIRED)
+find_package(ignition-cmake2 2.3 REQUIRED)
+set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
 
 #============================================================================
 # Configure the project

diff --git a/configure.bat b/configure.bat
@@ -8,7 +8,8 @@ call %win_lib% :download_unzip_install curl-7.57.0-vc15-x64-dll-MD.zip
 call %win_lib% :download_unzip_install jsoncpp-1.8.4-vc15-x64-dll-MD.zip
 call %win_lib% :download_unzip_install libyaml-0.1.7-vc15-x64-md.zip
 call %win_lib% :download_unzip_install libzip-1.4.0_zlip-1.2.11_vc15-x64-dll-MD.zip
-call %win_lib% :install_ign_project ign-common gz11
+call %win_lib% :install_ign_project ign-cmake ign-cmake2
+call %win_lib% :install_ign_project ign-common ign-common3
 
 :: Set configuration variables
 @set build_type=Release

diff --git a/include/ignition/fuel_tools/ClientConfig.hh b/include/ignition/fuel_tools/ClientConfig.hh
@@ -26,6 +26,13 @@
 
 #include "ignition/fuel_tools/Export.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -167,4 +174,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/CollectionIdentifier.hh b/include/ignition/fuel_tools/CollectionIdentifier.hh
@@ -23,6 +23,13 @@
 
 #include "ignition/fuel_tools/Helpers.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -105,4 +112,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/FuelClient.hh b/include/ignition/fuel_tools/FuelClient.hh
@@ -29,6 +29,13 @@
 #include "ignition/fuel_tools/Result.hh"
 #include "ignition/fuel_tools/WorldIter.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -309,4 +316,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/LocalCache.hh b/include/ignition/fuel_tools/LocalCache.hh
@@ -26,6 +26,13 @@
 #include "ignition/fuel_tools/ModelIter.hh"
 #include "ignition/fuel_tools/WorldIter.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::shared_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -103,4 +110,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/Model.hh b/include/ignition/fuel_tools/Model.hh
@@ -25,6 +25,12 @@
 #include "ignition/fuel_tools/Result.hh"
 #include "ignition/fuel_tools/ModelIdentifier.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::shared_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
 
 namespace ignition
 {
@@ -107,4 +113,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/ModelIdentifier.hh b/include/ignition/fuel_tools/ModelIdentifier.hh
@@ -18,7 +18,6 @@
 #ifndef IGNITION_FUEL_TOOLS_MODELIDENTIFIER_HH_
 #define IGNITION_FUEL_TOOLS_MODELIDENTIFIER_HH_
 
-// #include <array>
 #include <cstdint>
 #include <ctime>
 #include <memory>
@@ -27,6 +26,13 @@
 
 #include "ignition/fuel_tools/Helpers.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -236,4 +242,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/ModelIter.hh b/include/ignition/fuel_tools/ModelIter.hh
@@ -23,6 +23,13 @@
 #include "ignition/fuel_tools/Helpers.hh"
 #include "ignition/fuel_tools/Model.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -74,4 +81,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/ModelIterPrivate.hh b/include/ignition/fuel_tools/ModelIterPrivate.hh
@@ -26,6 +26,13 @@
 #include "ignition/fuel_tools/ModelIdentifier.hh"
 #include "ignition/fuel_tools/RestClient.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::vector
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -155,4 +162,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/ModelPrivate.hh b/include/ignition/fuel_tools/ModelPrivate.hh
@@ -23,6 +23,13 @@
 #include "ignition/fuel_tools/Helpers.hh"
 #include "ignition/fuel_tools/ModelIdentifier.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::string
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -39,4 +46,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/RestClient.hh b/include/ignition/fuel_tools/RestClient.hh
@@ -24,6 +24,13 @@
 
 #include "ignition/fuel_tools/Export.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::string
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -112,4 +119,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/Result.hh b/include/ignition/fuel_tools/Result.hh
@@ -23,6 +23,13 @@
 
 #include "ignition/fuel_tools/Export.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -119,4 +126,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/WorldIdentifier.hh b/include/ignition/fuel_tools/WorldIdentifier.hh
@@ -23,6 +23,13 @@
 
 #include "ignition/fuel_tools/Helpers.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -149,4 +156,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/WorldIter.hh b/include/ignition/fuel_tools/WorldIter.hh
@@ -22,6 +22,13 @@
 
 #include "ignition/fuel_tools/Helpers.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::unique_ptr
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -69,4 +76,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/include/ignition/fuel_tools/WorldIterPrivate.hh b/include/ignition/fuel_tools/WorldIterPrivate.hh
@@ -25,6 +25,13 @@
 #include "ignition/fuel_tools/WorldIdentifier.hh"
 #include "ignition/fuel_tools/RestClient.hh"
 
+#ifdef _WIN32
+// Disable warning C4251 which is triggered by
+// std::vector
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace ignition
 {
   namespace fuel_tools
@@ -129,4 +136,8 @@ namespace ignition
   }
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -63,6 +63,7 @@ ign_target_interface_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
 ign_build_tests(TYPE UNIT
                 SOURCES ${gtest_sources}
                 LIB_DEPS
+                  ignition-cmake${IGN_CMAKE_VER}::utilities
                   ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER}
                   TINYXML2::TINYXML2
 )