From 15ee28776255ede06e52d0bae6adaac03befa1dd Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Mon, 17 Sep 2012 09:42:05 +0200 Subject: [PATCH] Fixed wrong search path for VTK when OGS_LIBS_DIR was found. --- scripts/cmake/Find.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 4f3564ed459..ad78fb5bff1 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -6,6 +6,8 @@ FIND_PATH(OGS_LIBS_DIR_FOUND geotiff.lib PATHS $ENV{OGS_LIBS} ${OGS_LIBS_DIR} ${PROJECT_SOURCE_DIR}/../Libs C:/OGS_Libs PATH_SUFFIXES libgeotiff) +IF(OGS_LIBS_DIR_FOUND) + SET(OGS_LIBS_DIR ${OGS_LIBS_DIR_FOUND}/..) ###################### ### Find tools ### @@ -69,7 +71,7 @@ FIND_PACKAGE ( LAPACK ) ## VTK ## IF (OGS_LIBS_DIR_FOUND) - SET (VTK_DIR ${PROJECT_SOURCE_DIR}/../Libs/VTK/build) + SET (VTK_DIR ${OGS_LIBS_DIR_FOUND}/VTK/build) ENDIF () # OGS_LIBS_DIR_FOUND IF(NOT OGS_DONT_USE_VTK) FIND_PACKAGE( VTK ) -- GitLab