# HG changeset patch
# User Luis Saavedra <address@hidden>
# Date 1332279772 10800
# Node ID cefb03128afc41395a373618413ff275df4e8fe2
# Parent  021dc66eaf72b5d29aef8743fe1640d6d17dbead
fixes in installations paths, now  the libraries can be found with cmake-find_library

diff --git a/src/vtk.mk b/src/vtk.mk
--- a/src/vtk.mk
+++ b/src/vtk.mk
@@ -20,39 +20,41 @@
 endef
 
 define $(PKG)_BUILD
-
     # first we need a native build to create the compile tools
-    mkdir '$(1)/native_build'
-    cd '$(1)/native_build' && cmake \
-        -DCMAKE_BUILD_TYPE='Release' \
-        -DBUILD_TESTING=FALSE \
+    mkdir '$(1).native'
+    cd '$(1).native' && cmake \
         -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \
         -DVTK_USE_RENDERING=FALSE \
-        ..
-    
+        -DBUILD_TESTING=FALSE \
+        -DCMAKE_BUILD_TYPE='Release' \
+        '$(1)'
+
     # only the newly created CompileTools target need to be built
-    $(MAKE) -C '$(1)/native_build' -j '$(JOBS)' VERBOSE=1 CompileTools
-        
+    $(MAKE) -C '$(1).native' -j '$(JOBS)' VERBOSE=1 CompileTools
+
     # DirectX is detected on Mac OSX but requires a DX10 header - dxgi.h
     rm '$(1)/CMake/FindDirectX.cmake'
-    
+
     # now for the cross compilation
-    mkdir '$(1)/cross_build'
-    cd '$(1)/cross_build' && cmake \
-        -C '$(1)/TryRunResults.cmake'\
-        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'\
-        -DBUILD_TESTING=FALSE\
-        -DVTKCompileTools_DIR='$(1)/native_build'\
-        -DVTK_USE_SYSTEM_EXPAT=TRUE\
-        -DVTK_USE_SYSTEM_FREETYPE=TRUE\
-        -DVTK_USE_SYSTEM_JPEG=TRUE\
-        -DVTK_USE_SYSTEM_LIBXML2=TRUE\
-        -DVTK_USE_SYSTEM_PNG=TRUE\
-        -DVTK_USE_SYSTEM_TIFF=TRUE\
-        -DVTK_USE_SYSTEM_ZLIB=TRUE\
-        -DVTK_USE_QT=TRUE\
-        -DVTK_USE_POSTGRES=TRUE\
-        -DVTK_USE_ODBC=TRUE\
-        ..
-    $(MAKE) -C '$(1)/cross_build' -j '$(JOBS)' install VERBOSE=1
+    mkdir '$(1).build'
+    cd '$(1).build' && cmake \
+        -DVTKCompileTools_DIR:PATH='$(1).native' \
+        -DVTK_USE_SYSTEM_EXPAT=TRUE \
+        -DVTK_USE_SYSTEM_FREETYPE=TRUE \
+        -DVTK_USE_SYSTEM_JPEG=TRUE \
+        -DVTK_USE_SYSTEM_LIBXML2=TRUE \
+        -DVTK_USE_SYSTEM_PNG=TRUE \
+        -DVTK_USE_SYSTEM_TIFF=TRUE \
+        -DVTK_USE_SYSTEM_ZLIB=TRUE \
+        -DVTK_USE_QT=TRUE \
+        -DVTK_USE_POSTGRES=TRUE \
+        -DVTK_USE_ODBC=TRUE \
+        -DBUILD_TESTING=FALSE \
+        -DVTK_INSTALL_LIB_DIR:PATH='/lib' \
+        -DVTK_INSTALL_PACKAGE_DIR:PATH='/lib/vtk-5.8' \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+        -DCMAKE_BUILD_TYPE='Release' \
+        -C '$(1)/TryRunResults.cmake' \
+        '$(1)'
+    $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
 endef