Merge branch 'release/ViSTA-1.16'

9e422ba9 · sebastianfreitag · 24698ba5 · 5db03cb7 · 9e422ba9 · 9e422ba9
Commit 9e422ba9 authored 9 years ago by sebastianfreitag
--- a/.gitignore
+++ b/.gitignore
+share
--- a/FindV3dcsdk.cmake
+++ b/FindV3dcsdk.cmake
-# $Id: $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

 if( NOT V3DCSDK_FOUND )
-	vista_find_package_root( 3DCSDK Inc/si.h )
+	vista_find_package_root( 3DCSDK Inc/si.h SUBDIRS "3Dconnexion/3DxWare SDK" "3Dconnexion" "3DxWare SDK" "" )

 	if( 3DCSDK_ROOT_DIR )
 		unset ( V3DCSDK_FOUND CACHE )

--- a/FindVALUT.cmake
+++ b/FindVALUT.cmake
-# $Id$
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVAxis2.cmake
+++ b/FindVAxis2.cmake
-# $Id$
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVBoost.cmake
+++ b/FindVBoost.cmake
-# $Id: FindVBOOST.cmake 21495 2011-05-25 07:52:18Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVBullet.cmake
+++ b/FindVBullet.cmake
-# $Id$
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVCGAL.cmake
+++ b/FindVCGAL.cmake
-# $Id: FindVCGAL.cmake 21495 2011-05-25 07:52:18Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVCLEye.cmake
+++ b/FindVCLEye.cmake
-# $Id: FindVCLEYE.cmake 21495 2011-05-25 07:52:18Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVCURL.cmake
+++ b/FindVCURL.cmake
-# $Id: $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVCatsXFEMSolver.cmake
+++ b/FindVCatsXFEMSolver.cmake
-# $Id: FindVEigen.cmake 21495 2011-05-25 07:52:18Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVChai3D.cmake
+++ b/FindVChai3D.cmake
-# $Id: FindVChai3D.cmake 21495 2011-05-25 07:52:18Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVDepthSenseSDK.cmake
+++ b/FindVDepthSenseSDK.cmake
-# $Id: $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVDirectX.cmake
+++ b/FindVDirectX.cmake
-# $Id$
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVEigen.cmake
+++ b/FindVEigen.cmake
-# $Id: FindVEigen.cmake 21495 2011-05-25 07:52:18Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVFFmpeg.cmake
+++ b/FindVFFmpeg.cmake
-# $Id$
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVFOX.cmake
+++ b/FindVFOX.cmake
-# $Id: $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVFTGL.cmake
+++ b/FindVFTGL.cmake
-# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVFreeType.cmake
+++ b/FindVFreeType.cmake
-# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVGLEW.cmake
+++ b/FindVGLEW.cmake
-# $Id$
+

 include( FindPackageHandleStandardArgs )
 include( VistaFindUtils )

--- a/FindVGLFW.cmake
+++ b/FindVGLFW.cmake
+
+
+include( FindPackageHandleStandardArgs )
+include( VistaFindUtils )
+
+if( NOT VGLFW_FOUND )
+
+	vista_find_package_root( GLFW include/GLFW/glfw3.h )
+
+	if( GLFW_ROOT_DIR )
+		find_library( GLFW_LIBRARIES NAMES glfw glfw3 GLFW
+					PATHS ${GLFW_ROOT_DIR}/lib 
+					CACHE "GLFW library" )
+		mark_as_advanced( GLFW_LIBRARIES )
+
+		set( GLFW_INCLUDE_DIRS ${GLFW_ROOT_DIR}/include )
+		set( GLFW_LIBRARY_DIRS ${GLFW_ROOT_DIR}/lib  )
+		get_filename_component( GLFW_LIBRARY_DIRS ${GLFW_LIBRARIES} PATH )
+
+	endif( GLFW_ROOT_DIR )
+
+endif( NOT VGLFW_FOUND )
+
+find_package_handle_standard_args( VGLFW "GLFW could not be found" GLFW_ROOT_DIR )
+