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

Refactored geotiff library inclusion.

parent a8cd09fb
No related branches found
No related tags found
No related merge requests found
...@@ -3,15 +3,6 @@ IF (NOT VTK_FOUND) ...@@ -3,15 +3,6 @@ IF (NOT VTK_FOUND)
ENDIF (NOT VTK_FOUND) ENDIF (NOT VTK_FOUND)
INCLUDE( ${VTK_USE_FILE} ) INCLUDE( ${VTK_USE_FILE} )
# Find libgeotiff
FIND_PACKAGE( LibGeoTiff )
IF(libgeotiff_FOUND)
ADD_DEFINITIONS(-Dlibgeotiff_FOUND)
ENDIF() # libgeotiff_FOUND
IF(NOT MSVC)
FIND_PACKAGE( LibTiff )
ENDIF() # NOT MSVC
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /ZI /Od /Ob0") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /ZI /Od /Ob0")
# Add subprojects # Add subprojects
......
...@@ -91,14 +91,11 @@ IF (Shapelib_FOUND) ...@@ -91,14 +91,11 @@ IF (Shapelib_FOUND)
TARGET_LINK_LIBRARIES( ogs-gui ${Shapelib_LIBRARIES} ) TARGET_LINK_LIBRARIES( ogs-gui ${Shapelib_LIBRARIES} )
ENDIF () # Shapelib_FOUND ENDIF () # Shapelib_FOUND
MESSAGE(STATUS "${libgeotiff_LIBRARIES}")
IF (libgeotiff_FOUND) IF (libgeotiff_FOUND)
TARGET_LINK_LIBRARIES( ogs-gui ${libgeotiff_LIBRARIES} ) TARGET_LINK_LIBRARIES( ogs-gui ${libgeotiff_LIBRARIES} )
ENDIF () # libgeotiff_FOUND ENDIF () # libgeotiff_FOUND
IF (libtiff_FOUND)
TARGET_LINK_LIBRARIES( ogs-gui ${libtiff_LIBRARIES} )
ENDIF () # libtiff_FOUND
ADD_DEPENDENCIES ( ogs-gui VtkVis OGSProject ) ADD_DEPENDENCIES ( ogs-gui VtkVis OGSProject )
IF(MSVC) IF(MSVC)
...@@ -161,7 +158,6 @@ IF (OGS_VRED_PLUGIN) ...@@ -161,7 +158,6 @@ IF (OGS_VRED_PLUGIN)
QtDataView QtDataView
StratView StratView
${Shapelib_LIBRARIES} ${Shapelib_LIBRARIES}
${libtiff_LIBRARIES}
${libgeotiff_LIBRARIES} ${libgeotiff_LIBRARIES}
QVTK QVTK
VtkVis VtkVis
......
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