diff --git a/.gitignore b/.gitignore index e73b44c2a0ce7d1cda76dd1082a9523b95744c34..054d05d15ea9d39017794d7c141e9979ecdb5ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ tags .idea/tasks.xml .idea/dictionaries .idea/modules.xml + +# Conan package manager +conanbuildinfo.cmake +conaninfo.txt diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake index d04db7140d006884fea742b44c961c9ad1777ff2..cc7dbf79bc20b39a9dba3a042cb487c721e4e590 100644 --- a/Applications/DataExplorer/DataExplorer.cmake +++ b/Applications/DataExplorer/DataExplorer.cmake @@ -73,13 +73,11 @@ endif() if(VTK_NETCDF_FOUND) target_link_libraries(DataExplorer vtkNetCDF vtkNetCDF_cxx ) -else() - target_link_libraries(DataExplorer ${Shapelib_LIBRARIES} ) -endif () # Shapelib_FOUND +endif() -if (GEOTIFF_FOUND) +if(GEOTIFF_FOUND) target_link_libraries(DataExplorer ${GEOTIFF_LIBRARIES} ) -endif () # GEOTIFF_FOUND +endif() add_dependencies (DataExplorer VtkVis) diff --git a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp index fc8057ee17b66be17fb149ac3a5224061577bb80..1daacdf9a3a527e8ba3a5cd51ad260c7b83f0b63 100644 --- a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp +++ b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp @@ -24,7 +24,7 @@ #include "logog/include/logog.hpp" // ShapeLib -#include "shape/shapefil.h" +#include <shapefil.h> // BaseLib #include "LogogSimpleFormatter.h" diff --git a/CMakeLists.txt b/CMakeLists.txt index d3ac9ed761922d197531513d7dd983a1774eca9e..dba02ede5a3ecc81b274bf35da1e6e3653544f8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,9 @@ set(OGS_CPU_ARCHITECTURE "native" CACHE STRING "Processor architecture, defaults option(OGS_BUILD_TESTS "Should the test executables be built?" ON) ### CMake includes ### +include(conanbuildinfo.cmake) +conan_basic_setup() + include(scripts/cmake/CheckTypeSizes.cmake) include(scripts/cmake/Functions.cmake) include(scripts/cmake/CMakeSetup.cmake) diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt index 9ebfdfb669cd194a59433c1edecdd4a1f7e411b6..42e8b7841a613ca03c99c3b86ec89ee942683943 100644 --- a/FileIO/CMakeLists.txt +++ b/FileIO/CMakeLists.txt @@ -59,7 +59,7 @@ target_link_libraries(FileIO INTERFACE InSituLib MeshLib logog - shp + ${CONAN_LIBS} ) if(QT4_FOUND) target_link_libraries(FileIO PUBLIC Qt4::QtXml Qt4::QtXmlPatterns) diff --git a/FileIO/SHPInterface.h b/FileIO/SHPInterface.h index b29a881832e139cb42eccbfa0b9ceba1da2c643c..241809c416e859595a2fb01084a612be7b104e3a 100644 --- a/FileIO/SHPInterface.h +++ b/FileIO/SHPInterface.h @@ -22,7 +22,7 @@ #include <vector> //ShapeLib includes -#include "shape/shapefil.h" +#include <shapefil.h> namespace GeoLib { diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index f28670b9751b40d2e2105a2f7ab64af2b2d40295..49f7aa5ea6afcda7d02a4eb12344929d76c2f449 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -16,8 +16,6 @@ set_target_properties(test-logog PROPERTIES EXCLUDE_FROM_ALL TRUE) add_subdirectory(gtest) -add_subdirectory(shape) - # This is a workaround for Travis builds. option(OGS_USE_OPTIONAL_SUBMODULES "Option for enabling optional submodules" OFF) diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000000000000000000000000000000000000..fead82e93b9a1df46c9233caa19103ed6e447e8c --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,5 @@ +[requires] +Shapelib/1.3.0@bilke/stable + +[generators] +cmake