From c5b88c32d36820db179c1703400f91aca4fb8e9f Mon Sep 17 00:00:00 2001 From: Julien Michel <julien.michel@cnes.fr> Date: Mon, 20 Nov 2017 17:14:41 +0100 Subject: [PATCH] COMP: Fixing test compilation --- .../OssimPlugins/include/ossim/ossimKeyWordListUtilities.h | 4 ++-- .../OssimPlugins/include/ossim/ossimSarSensorModel.h | 4 ++-- .../OssimPlugins/include/ossim/ossimTimeUtilities.h | 4 ++-- .../ThirdParty/OssimPlugins/test/ossimSarSensorModelTest.cpp | 2 +- .../ThirdParty/OssimPlugins/test/ossimStringUtilitiesTest.cpp | 2 +- .../ThirdParty/OssimPlugins/test/ossimTimeUtilitiesTest.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimKeyWordListUtilities.h b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimKeyWordListUtilities.h index 235ea89adc..fb665c4fbc 100644 --- a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimKeyWordListUtilities.h +++ b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimKeyWordListUtilities.h @@ -26,8 +26,8 @@ #ifndef ossimKeyWordListUtilities_h #define ossimKeyWordListUtilities_h -#include "ossimStringUtilities.h" -#include "ossimXmlTools.h" +#include "ossim/ossimStringUtilities.h" +#include "ossim/ossimXmlTools.h" #include <ossim/base/ossimKeywordlist.h> #include <ossim/base/ossimRefPtr.h> #include <ossim/base/ossimXmlNode.h> diff --git a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h index e62e774cf0..1662c7db6d 100644 --- a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h +++ b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h @@ -38,14 +38,14 @@ # pragma GCC diagnostic ignored "-Wshadow" # include <ossim/projection/ossimSensorModel.h> # include <ossim/elevation/ossimHgtRef.h> -# include "ossimTimeUtilities.h" +# include "ossim/ossimTimeUtilities.h" # pragma GCC diagnostic pop #else # include <ossim/projection/ossimSensorModel.h> # include <ossim/elevation/ossimHgtRef.h> -# include "ossimTimeUtilities.h" +# include "ossim/ossimTimeUtilities.h" #endif #if defined(USE_BOOST_TIME) diff --git a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimTimeUtilities.h b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimTimeUtilities.h index 284b18bf71..e566fd815d 100644 --- a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimTimeUtilities.h +++ b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimTimeUtilities.h @@ -25,8 +25,8 @@ #ifndef ossimTimeUtilities_h #define ossimTimeUtilities_h -#include "ossimStringUtilities.h" -#include "ossimOperatorUtilities.h" +#include "ossim/ossimStringUtilities.h" +#include "ossim/ossimOperatorUtilities.h" #include "ossimPluginConstants.h" #include <cassert> #include <ostream> diff --git a/Modules/ThirdParty/OssimPlugins/test/ossimSarSensorModelTest.cpp b/Modules/ThirdParty/OssimPlugins/test/ossimSarSensorModelTest.cpp index f473549e16..11440ce243 100644 --- a/Modules/ThirdParty/OssimPlugins/test/ossimSarSensorModelTest.cpp +++ b/Modules/ThirdParty/OssimPlugins/test/ossimSarSensorModelTest.cpp @@ -23,7 +23,7 @@ */ -#include "ossimSarSensorModel.h" +#include "ossim/ossimSarSensorModel.h" int main(int, char *[]) diff --git a/Modules/ThirdParty/OssimPlugins/test/ossimStringUtilitiesTest.cpp b/Modules/ThirdParty/OssimPlugins/test/ossimStringUtilitiesTest.cpp index 68ee097d41..8dc7d7e1aa 100644 --- a/Modules/ThirdParty/OssimPlugins/test/ossimStringUtilitiesTest.cpp +++ b/Modules/ThirdParty/OssimPlugins/test/ossimStringUtilitiesTest.cpp @@ -31,7 +31,7 @@ #define BOOST_TEST_MODULE "ossim String Utilities unit testing" #define BOOST_TEST_DYN_LINK -#include "ossimStringUtilities.h" +#include "ossim/ossimStringUtilities.h" #include <boost/test/unit_test.hpp> #include <cstdio> #include <iostream> diff --git a/Modules/ThirdParty/OssimPlugins/test/ossimTimeUtilitiesTest.cpp b/Modules/ThirdParty/OssimPlugins/test/ossimTimeUtilitiesTest.cpp index d97224e418..57efd8ff80 100644 --- a/Modules/ThirdParty/OssimPlugins/test/ossimTimeUtilitiesTest.cpp +++ b/Modules/ThirdParty/OssimPlugins/test/ossimTimeUtilitiesTest.cpp @@ -31,8 +31,8 @@ #define BOOST_TEST_MODULE "ossim Time Utilities unit testing" #define BOOST_TEST_DYN_LINK -#include "ossimTimeUtilities.h" -#include "ossimStringUtilities.h" +#include "ossim/ossimTimeUtilities.h" +#include "ossim/ossimStringUtilities.h" #include <boost/test/unit_test.hpp> #include <iostream> #include <iomanip> -- GitLab