From 2b95bafb5f8ad83c4889a7613fa7fd08bc260895 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 17 Feb 2012 09:55:10 +0100
Subject: [PATCH] Refactored geotiff library inclusion.
---
CMakeLists.txt | 9 ---------
Gui/CMakeLists.txt | 6 +-----
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00c6b33a9e7..88fdb47082f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,15 +3,6 @@ IF (NOT VTK_FOUND)
ENDIF (NOT VTK_FOUND)
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")
# Add subprojects
diff --git a/Gui/CMakeLists.txt b/Gui/CMakeLists.txt
index 8fc58304bc0..28ecdf81d5d 100644
--- a/Gui/CMakeLists.txt
+++ b/Gui/CMakeLists.txt
@@ -91,14 +91,11 @@ IF (Shapelib_FOUND)
TARGET_LINK_LIBRARIES( ogs-gui ${Shapelib_LIBRARIES} )
ENDIF () # Shapelib_FOUND
+MESSAGE(STATUS "${libgeotiff_LIBRARIES}")
IF (libgeotiff_FOUND)
TARGET_LINK_LIBRARIES( ogs-gui ${libgeotiff_LIBRARIES} )
ENDIF () # libgeotiff_FOUND
-IF (libtiff_FOUND)
- TARGET_LINK_LIBRARIES( ogs-gui ${libtiff_LIBRARIES} )
-ENDIF () # libtiff_FOUND
-
ADD_DEPENDENCIES ( ogs-gui VtkVis OGSProject )
IF(MSVC)
@@ -161,7 +158,6 @@ IF (OGS_VRED_PLUGIN)
QtDataView
StratView
${Shapelib_LIBRARIES}
- ${libtiff_LIBRARIES}
${libgeotiff_LIBRARIES}
QVTK
VtkVis
--
GitLab