Skip to content
Snippets Groups Projects
Commit b36c1df0 authored by Lars Bilke's avatar Lars Bilke
Browse files

Use conan shapelib package.

parent c3a4370a
No related branches found
No related tags found
No related merge requests found
......@@ -10,3 +10,7 @@ tags
.idea/tasks.xml
.idea/dictionaries
.idea/modules.xml
# Conan package manager
conanbuildinfo.cmake
conaninfo.txt
......@@ -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)
......
......@@ -24,7 +24,7 @@
#include "logog/include/logog.hpp"
// ShapeLib
#include "shape/shapefil.h"
#include <shapefil.h>
// BaseLib
#include "LogogSimpleFormatter.h"
......
......@@ -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)
......
......@@ -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)
......
......@@ -22,7 +22,7 @@
#include <vector>
//ShapeLib includes
#include "shape/shapefil.h"
#include <shapefil.h>
namespace GeoLib {
......
......@@ -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)
......
[requires]
Shapelib/1.3.0@bilke/stable
[generators]
cmake
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment