diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..75701e4b42fbe21334bbcd205480fb352d2a6838 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +share diff --git a/FindV3dcsdk.cmake b/FindV3dcsdk.cmake index 3e5862c7af44561a4bab07a48818e189645dbf2c..45e9c708186ab5c18be0fe9d4f74fb77251805ec 100644 --- a/FindV3dcsdk.cmake +++ b/FindV3dcsdk.cmake @@ -1,10 +1,10 @@ -# $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 ) diff --git a/FindVALUT.cmake b/FindVALUT.cmake index b26634d7d9831b1871d3d594ab406a8124c152da..949f295e45222f695d2bf76b30a6c0e8050d92f3 100644 --- a/FindVALUT.cmake +++ b/FindVALUT.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVAxis2.cmake b/FindVAxis2.cmake index 684767124dfe53974f26ba94967e7e41152a6201..fddb65e972869c851ea593813859e64c2bf01235 100755 --- a/FindVAxis2.cmake +++ b/FindVAxis2.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVBoost.cmake b/FindVBoost.cmake index 191aaf4f5f7fd0a662700449f34d2fec2af93ae2..20eb6251f5daa718ee956cefea88ec5f6f0d5ead 100644 --- a/FindVBoost.cmake +++ b/FindVBoost.cmake @@ -1,4 +1,4 @@ -# $Id: FindVBOOST.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVBullet.cmake b/FindVBullet.cmake index fdd6918a80d5d417d03ce8c3d371407c367168e3..1e817a24a460a8c0baf5e5594924e0631d93f66f 100644 --- a/FindVBullet.cmake +++ b/FindVBullet.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVCGAL.cmake b/FindVCGAL.cmake index 999d08156c9af2413ff8fc9a85e2af94485cb95d..e80f541d16becead89216dc06dfdee9e93b5535e 100644 --- a/FindVCGAL.cmake +++ b/FindVCGAL.cmake @@ -1,4 +1,4 @@ -# $Id: FindVCGAL.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVCLEye.cmake b/FindVCLEye.cmake index eb965acdffac0b3cdedc0af042d5bc8ca4ad6947..56805c461745e1199a74ae90d5aec7f0e0f7da58 100644 --- a/FindVCLEye.cmake +++ b/FindVCLEye.cmake @@ -1,4 +1,4 @@ -# $Id: FindVCLEYE.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVCURL.cmake b/FindVCURL.cmake index 81a604388e0ce972993bac9611e746523d423901..62a82a8929832aa40e46340aae3768d096c34ebf 100644 --- a/FindVCURL.cmake +++ b/FindVCURL.cmake @@ -1,4 +1,4 @@ -# $Id: $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVCatsXFEMSolver.cmake b/FindVCatsXFEMSolver.cmake index 5224d14bc3cdf4f0f0ff14917da0dcbe03dc6bc5..5f53b9c2740df19c630ac119c404bd8a32f18135 100644 --- a/FindVCatsXFEMSolver.cmake +++ b/FindVCatsXFEMSolver.cmake @@ -1,4 +1,4 @@ -# $Id: FindVEigen.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVChai3D.cmake b/FindVChai3D.cmake index c74206a32bd4ef47eddacb30ddb526fd1dfb8c15..1d1e09a3647a4ce02e75c2dcaa8e4cfb72acb0ab 100644 --- a/FindVChai3D.cmake +++ b/FindVChai3D.cmake @@ -1,4 +1,4 @@ -# $Id: FindVChai3D.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVDepthSenseSDK.cmake b/FindVDepthSenseSDK.cmake index 563f2c3d9f7bd2522a22992880cfae1a9bcb67e3..0635a0d97547d95f7f611434313138f69329cf31 100644 --- a/FindVDepthSenseSDK.cmake +++ b/FindVDepthSenseSDK.cmake @@ -1,4 +1,4 @@ -# $Id: $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVDirectX.cmake b/FindVDirectX.cmake index f31e82676a6bcf933339b1350e8074b049f2d3a5..c0ebcda584a80492c0e0aa18e6d37f72a1391eda 100644 --- a/FindVDirectX.cmake +++ b/FindVDirectX.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVEigen.cmake b/FindVEigen.cmake index 717ecfe6dfc742f8e8ea7a7b7e338dd9589840ae..278ad063c8ca09b4600bce1a46abc905f8ab11c8 100644 --- a/FindVEigen.cmake +++ b/FindVEigen.cmake @@ -1,4 +1,4 @@ -# $Id: FindVEigen.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVFFmpeg.cmake b/FindVFFmpeg.cmake index d6d91783d3d8318bf184d912604e956a641c2ace..eca8fce5fd8346cffc3ab743e3ba3dcbce495371 100644 --- a/FindVFFmpeg.cmake +++ b/FindVFFmpeg.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVFOX.cmake b/FindVFOX.cmake index 68da4a170072da55a246ed2d07ed58a537181f12..232d39a096a8566966f3cc85ee22a96310c11777 100644 --- a/FindVFOX.cmake +++ b/FindVFOX.cmake @@ -1,4 +1,4 @@ -# $Id: $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVFTGL.cmake b/FindVFTGL.cmake index 7f58a9eca4d98eabdaabeaa3e40f5f0fef01650b..4184098d1771ea06729f8bad827e9c2b5c515ffe 100644 --- a/FindVFTGL.cmake +++ b/FindVFTGL.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVFreeType.cmake b/FindVFreeType.cmake index ec7e84f67fb2309dfbce0df2f2118a437d14ae88..3837768e2db67caafd621c2435a33da3acaf33ea 100644 --- a/FindVFreeType.cmake +++ b/FindVFreeType.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVGLEW.cmake b/FindVGLEW.cmake index d1eb595f845a51849863cd850947fc8c8103239c..c386c0ed6700efc858b9b64dd8cd2283f3de98bf 100644 --- a/FindVGLEW.cmake +++ b/FindVGLEW.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVGLFW.cmake b/FindVGLFW.cmake new file mode 100644 index 0000000000000000000000000000000000000000..a783acd71aa5f4f8cb074986d3f56d1c35c20e3b --- /dev/null +++ b/FindVGLFW.cmake @@ -0,0 +1,25 @@ + + +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 ) + diff --git a/FindVGLUT.cmake b/FindVGLUT.cmake index 24b630e10b891887e703c470b8d4a5e7e8cb7d02..3501f785412ba5bd421f44511610fb325d79d4cd 100644 --- a/FindVGLUT.cmake +++ b/FindVGLUT.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) diff --git a/FindVGSL.cmake b/FindVGSL.cmake index 0768e2efa41ecb034411c6a007c274bf5c0339aa..71f902164ee582db8b773ee9fb66e029b9559605 100644 --- a/FindVGSL.cmake +++ b/FindVGSL.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGSL.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + # find package for the gnu scientific library # download from: http://gnuwin32.sourceforge.net/packages/gsl.htm diff --git a/FindVGTest.cmake b/FindVGTest.cmake index 6323f88c17b5b8d556fa93fc7eb0880dfb770bc6..c4cf00ecf6413e52d4b0a8fc3ac34a8f9d37eeed 100644 --- a/FindVGTest.cmake +++ b/FindVGTest.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGTEST.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVHPMC.cmake b/FindVHPMC.cmake index 766653d8dec64e1f16247eec3fa24f9deb398f7a..12b63ab338b63580fb7992ddb887a2821ffbcaaf 100644 --- a/FindVHPMC.cmake +++ b/FindVHPMC.cmake @@ -1,4 +1,4 @@ -# $Id: FindVHPMC.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVHunspell.cmake b/FindVHunspell.cmake index 9f2884630395eada10879a6b5c5cd52bb2b0f3e8..ecb086c92f952f0c988233319427da9006ae1435 100644 --- a/FindVHunspell.cmake +++ b/FindVHunspell.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVLeapSDK.cmake b/FindVLeapSDK.cmake index b1d465d4a681501189df912450cf488091196757..a37ce36ddb642a5007e32cd476ac2cde55d4e429 100644 --- a/FindVLeapSDK.cmake +++ b/FindVLeapSDK.cmake @@ -1,4 +1,4 @@ -# $Id: FindVLeapSDK.cmake 31553 2012-08-13 13:21:14Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVMKL.cmake b/FindVMKL.cmake index c770952c21001da25fbf7736a1c0b0c58bf7d6f2..5e820d09d4f66f9a90f7fc6b7a6c566e544a0310 100644 --- a/FindVMKL.cmake +++ b/FindVMKL.cmake @@ -1,4 +1,4 @@ -# $Id: FindVMKL.cmake 31553 2012-08-13 13:21:14Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVMPI.cmake b/FindVMPI.cmake index 30c23da59018b41cda0781d1bfad424cee0de314..07110d70ff1da40ee9f2f3efa33053aa6fbcea56 100644 --- a/FindVMPI.cmake +++ b/FindVMPI.cmake @@ -1,4 +1,4 @@ -# $Id: FindVMPI.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVMeschach.cmake b/FindVMeschach.cmake index 3b9cf1eee971e63a8a61da14f991d2e402b7016d..b1fae5e78197e6e3a27eddd1ae56c105e4981aa2 100644 --- a/FindVMeschach.cmake +++ b/FindVMeschach.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVMsinttypes.cmake b/FindVMsinttypes.cmake index 1ef8361c8dbdfbdc843ddc1913100541acf5556a..b0bd3866213008e1a9080345a36a6e48b31971c9 100644 --- a/FindVMsinttypes.cmake +++ b/FindVMsinttypes.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVNIFTI.cmake b/FindVNIFTI.cmake index ddb9c99bf54d7614e90cffae4d06e20eb7fcac04..999a105b5ddfeb45b9dd4c1703667c004c43b0b6 100644 --- a/FindVNIFTI.cmake +++ b/FindVNIFTI.cmake @@ -1,4 +1,4 @@ -# $Id: FindZMQ.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVNatNetSDK.cmake b/FindVNatNetSDK.cmake index 7a3987b92f2fdaa09119d0a93dde9543d4ecfb29..b85cf3d749214812b55444f6802a47bba5d27d8c 100644 --- a/FindVNatNetSDK.cmake +++ b/FindVNatNetSDK.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGLUT.cmake 35232 2013-05-27 13:16:20Z cn276793 $ + include( FindPackageHandleStandardArgs ) diff --git a/FindVODE.cmake b/FindVODE.cmake index 825a1d13c6150949de97c1602595c1739205ac7e..cba698e75d4ae544f1f3621d9143b2de4ae2a292 100644 --- a/FindVODE.cmake +++ b/FindVODE.cmake @@ -1,4 +1,4 @@ -# $Id: FindZMQ.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOculusSDK.cmake b/FindVOculusSDK.cmake index f4af994afcd14259becead64c2e3a0547c9ea8bf..3539ff104767314f2833d6b1e5f86bcb35476c00 100644 --- a/FindVOculusSDK.cmake +++ b/FindVOculusSDK.cmake @@ -1,4 +1,4 @@ -# $Id: FindVOculusSDK.cmake 31553 2012-08-13 13:21:14Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenAL.cmake b/FindVOpenAL.cmake index 68734b558d8843e87631d055a6dd8f41d329fe36..e85a1dc75c7631e30494e6bdd5e6a1e154780b5c 100644 --- a/FindVOpenAL.cmake +++ b/FindVOpenAL.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenCL.cmake b/FindVOpenCL.cmake index dd15ade7baf9e535060fae34184bff51b8c9d61e..40f029db468274fade9313da7865335f0163bc79 100644 --- a/FindVOpenCL.cmake +++ b/FindVOpenCL.cmake @@ -1,4 +1,4 @@ -# $Id: FindVOPENCL.cmake 21620 2011-05-30 10:28:48Z cn276793 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenCV.cmake b/FindVOpenCV.cmake index 966723e4115d6c5d4751df7c9024579c56340287..d038c248a85a1f3df878f8c87c078cbec3b036a5 100644 --- a/FindVOpenCV.cmake +++ b/FindVOpenCV.cmake @@ -1,4 +1,4 @@ -# $Id: FindVOPENCV.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) @@ -6,16 +6,16 @@ include( VistaFindUtils ) if( NOT VOPENCV_FOUND ) - # search config file - vista_find_package_root( OpenCV OpenCVConfig.cmake NAMES OpenCV opencv share/OpenCV share/opencv ADVANCED ) - if( NOT OPENCV_ROOT_DIR ) - vista_find_package_root( OpenCV share/OpenCVConfig.cmake NAMES OpenCV opencv share/OpenCV share/opencv ADVANCED ) - endif() - if( NOT OPENCV_ROOT_DIR ) - vista_find_package_root( OpenCV share/OpenCV/OpenCVConfig.cmake NAMES OpenCV opencv share/OpenCV share/opencv ADVANCED ) + # search config file + vista_find_package_root( OpenCV OpenCVConfig.cmake NAMES OpenCV opencv share/OpenCV share/opencv ADVANCED ) + if( NOT OPENCV_ROOT_DIR ) + vista_find_package_root( OpenCV share/OpenCVConfig.cmake NAMES OpenCV opencv share/OpenCV share/opencv ADVANCED ) + endif() + if( NOT OPENCV_ROOT_DIR ) + vista_find_package_root( OpenCV share/OpenCV/OpenCVConfig.cmake NAMES OpenCV opencv share/OpenCV share/opencv ADVANCED ) endif() - set( OPENCV_FOUND ) + set( OPENCV_FOUND ) set( OpenCV_FOUND ) set( CMAKE_PREFIX_PATH "${OPENCV_ROOT_DIR}" ${CMAKE_PREFIX_PATH} ) vista_find_original_package( VOpenCV ) @@ -34,4 +34,4 @@ endif( NOT VOPENCV_FOUND ) find_package_handle_standard_args( VOpenCV "OpenCV could not be found" OPENCV_LIBRARIES ) - + diff --git a/FindVOpenGL.cmake b/FindVOpenGL.cmake index abdc0b84eae8411aecc493f2c67f4b68189141bb..a95a9bdc87f32f626a034d6855a76960582c7a4f 100644 --- a/FindVOpenGL.cmake +++ b/FindVOpenGL.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) diff --git a/FindVOpenHaptics.cmake b/FindVOpenHaptics.cmake index f9d87535f0b747634fb00428c7579949b12912bf..d238b84437a0452d57632e0135c5e8eaa574ff9b 100644 --- a/FindVOpenHaptics.cmake +++ b/FindVOpenHaptics.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenMP.cmake b/FindVOpenMP.cmake index abb1fa92001c5268edad01c8fa55e3f64f2caec7..9a11a8ac774722ff1a344690af7da59d6d98e25a 100644 --- a/FindVOpenMP.cmake +++ b/FindVOpenMP.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenMesh.cmake b/FindVOpenMesh.cmake index f4d2a464e0b7c332a6227006dcfe489342baa1c2..3b5b6d59a7c6383965784fa1ccf43723bfc7f4b8 100644 --- a/FindVOpenMesh.cmake +++ b/FindVOpenMesh.cmake @@ -1,4 +1,4 @@ -# $Id: FindVOpenMesh.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenNI.cmake b/FindVOpenNI.cmake index e82c535f21868b8b1a03dc4c82370cb17e6bfbe1..e945866e137ec3a06ca784d7dce8f0778fbcbb05 100644 --- a/FindVOpenNI.cmake +++ b/FindVOpenNI.cmake @@ -1,4 +1,4 @@ -# $Id: FindVopenni.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenNI2.cmake b/FindVOpenNI2.cmake index 09176ff35ae92aaff6598aa30fad74aaf92e1b9a..06b774135893476a595a8eb6b0ac033b3c56b1fd 100644 --- a/FindVOpenNI2.cmake +++ b/FindVOpenNI2.cmake @@ -1,4 +1,4 @@ -# $Id: FindVopenni.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenSG.cmake b/FindVOpenSG.cmake index c13b09c65973581d2e60f57c4f55f5919394e79e..4e763662d40b529e9972d0efe8343d2e56962279 100644 --- a/FindVOpenSG.cmake +++ b/FindVOpenSG.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOpenSceneGraph.cmake b/FindVOpenSceneGraph.cmake index b0cfab1097f77c668f1c20fa4c0c78c36a74b4bf..235b641b3562fa9e305aaa701e47e472b842a947 100644 --- a/FindVOpenSceneGraph.cmake +++ b/FindVOpenSceneGraph.cmake @@ -1,4 +1,4 @@ -# $Id: FindVOpenSG.cmake 22870 2011-08-08 07:10:04Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVOptitrackCameraSDK.cmake b/FindVOptitrackCameraSDK.cmake index c67d8d453f7e09c20575ff1569df4f14d52f92bd..bdbdae0076d5f13f3a5aa00df8848b736b0f117c 100644 --- a/FindVOptitrackCameraSDK.cmake +++ b/FindVOptitrackCameraSDK.cmake @@ -1,4 +1,4 @@ -# $Id: FindVOPTITRACKCAMERASDK.cmake 31553 2012-08-13 13:21:14Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVPNG.cmake b/FindVPNG.cmake index cf7631cb275c8a30976ba2fc816f74b62bcc5b37..659eaac3910c23efb72409510a66f4e00e71fcd8 100644 --- a/FindVPNG.cmake +++ b/FindVPNG.cmake @@ -1,4 +1,4 @@ -# $Id: FindZMQ.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVPythonLibs.cmake b/FindVPythonLibs.cmake index e28efa62bd8d39a5ff023f3c46665bda7c92512d..f42bde21cdb61def73256c320b46918cc3e475c9 100644 --- a/FindVPythonLibs.cmake +++ b/FindVPythonLibs.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVQhull.cmake b/FindVQhull.cmake index be2b9e3505b4184a3b011676483e069e6e002557..79a3538c8c033b06b5936ae5d4a813f67f6118eb 100644 --- a/FindVQhull.cmake +++ b/FindVQhull.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVQwt.cmake b/FindVQwt.cmake index fa9874d606587d3ac6bf091d287eabe1ac933830..d55944a109f7c01d42410e342daa4f09aa5fb998 100644 --- a/FindVQwt.cmake +++ b/FindVQwt.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVSQLite.cmake b/FindVSQLite.cmake index aac6bac439f1e41aa90e52a5aaa03a7a78ca544b..868291b7f99b7feb4edc76fc665f129f014530bc 100644 --- a/FindVSQLite.cmake +++ b/FindVSQLite.cmake @@ -1,4 +1,4 @@ -# $Id: $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVSVN.cmake b/FindVSVN.cmake index 1553751a4a3a53d08a863771969ecf2d77f85267..49bfa87e8b375205188e3c42b490cdc368fae873 100644 --- a/FindVSVN.cmake +++ b/FindVSVN.cmake @@ -1,4 +1,4 @@ -# $Id: FindVOPENCL.cmake 21620 2011-05-30 10:28:48Z cn276793 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVSixenseSDK.cmake b/FindVSixenseSDK.cmake index db9d8506e9e03fcf391074f1a962adc22747c8aa..dc49a8d6c205f2d4c4ccfae5c7d0ed2a814db0c8 100644 --- a/FindVSixenseSDK.cmake +++ b/FindVSixenseSDK.cmake @@ -1,4 +1,4 @@ -# $Id: FindVSIXENSESDK.cmake 31553 2012-08-13 13:21:14Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVSmartBody.cmake b/FindVSmartBody.cmake index 19228b4305af401bfaf6d2fa6f8951c2ce23039d..e5d101c309e7fd7db4234cf379451e1896fd4cff 100644 --- a/FindVSmartBody.cmake +++ b/FindVSmartBody.cmake @@ -1,4 +1,4 @@ -# $Id: FindVSmartBody.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVSofa.cmake b/FindVSofa.cmake index 453ab32deaee4257689ac6c2115b1df51b8d9699..91cfa8140a3f03e528b302fea4a54fa9b597ef2f 100644 --- a/FindVSofa.cmake +++ b/FindVSofa.cmake @@ -1,4 +1,4 @@ -# $Id$ + # Tested with: Sofa 1.0 rev10511@svn://scm.gforge.inria.fr/svn/sofa/trunk/Sofa diff --git a/FindVSolid.cmake b/FindVSolid.cmake index fb17ca850076fe523a94dd9165154c4b6cb37c09..cfa1470c02d42db306ca1d52eac2c57556b2b577 100644 --- a/FindVSolid.cmake +++ b/FindVSolid.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVTBB.cmake b/FindVTBB.cmake index 43baaf648d0547462527eb663d05a5b9d3a15547..aa2ce89e0e65dd0065fbea6e0647222b5a3106f4 100644 --- a/FindVTBB.cmake +++ b/FindVTBB.cmake @@ -1,4 +1,4 @@ -# $Id: FindVTBB.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVVLD.cmake b/FindVVLD.cmake index e774dd4164ad8b2eb6fa296b93b55da320847817..1e37faba8a27bbddc9b581ac27baaf510e5fa785 100644 --- a/FindVVLD.cmake +++ b/FindVVLD.cmake @@ -1,4 +1,4 @@ -# $Id: FindVChai3D.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVVTK.cmake b/FindVVTK.cmake index 819febb9915e8671e06098cad5418a918bbe993a..5b67c288a45440942ceec37087a194950ddcc287 100644 --- a/FindVVTK.cmake +++ b/FindVVTK.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVVTK6-vrgoup.cmake b/FindVVTK6-vrgoup.cmake index 76f18278a5197c0550dd80c91af438465c09822c..730f612447e6c37520e230f57143e5c462eacfba 100644 --- a/FindVVTK6-vrgoup.cmake +++ b/FindVVTK6-vrgoup.cmake @@ -1,4 +1,4 @@ -# $Id: FindVVTK.cmake 37930 2013-09-13 08:09:16Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVVirtualAcoustics.cmake b/FindVVirtualAcoustics.cmake index 04305cc9071894443f234d586f5ed6642a0357a8..9511b2d1af488ef07f71768923dac45eb8ebf20b 100644 --- a/FindVVirtualAcoustics.cmake +++ b/FindVVirtualAcoustics.cmake @@ -1,4 +1,4 @@ -# $Id: FindVVIRTUALACOUSTICS.cmake 31553 2012-08-13 13:21:14Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVWdkATL.cmake b/FindVWdkATL.cmake index c061f3339dac86d1989f5bedb0a10aed9d65c52b..db576ed9d0ee37faaf9ed5b7ae63b9bc150a1d9b 100644 --- a/FindVWdkATL.cmake +++ b/FindVWdkATL.cmake @@ -1,4 +1,4 @@ -# $Id: FindVWDKATL.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVZEQ.cmake b/FindVZEQ.cmake index 29a05f633a7d1ca352776c574b04073dd260025a..b611f942b0d8df14d436e37d3acd2e8ef6483258 100644 --- a/FindVZEQ.cmake +++ b/FindVZEQ.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVZLIB.cmake b/FindVZLIB.cmake index 0f8b067e36ef0278f1f7019b08f3c81154c8693f..73ae10fff3b3d6b46efac983e3d0d5d1e08f157f 100644 --- a/FindVZLIB.cmake +++ b/FindVZLIB.cmake @@ -1,4 +1,4 @@ -# $Id: FindZMQ.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVZMQ.cmake b/FindVZMQ.cmake index 0df0eed01e83ca389741ee779eb0ed5f7e60e1f2..ce4a110e8a5efee24e562f34eecf790cfb42b4dc 100644 --- a/FindVZMQ.cmake +++ b/FindVZMQ.cmake @@ -1,4 +1,4 @@ -# $Id: FindZMQ.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVgmp.cmake b/FindVgmp.cmake index 1dac4cfa76c9aa4d98d75667b33f46b5972eea5f..14c0dab44e8d259b8edc058a607c81eca86baf8c 100644 --- a/FindVgmp.cmake +++ b/FindVgmp.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGMP.cmake 35232 2013-05-27 13:16:20Z cn276793 $ + include( FindPackageHandleStandardArgs ) diff --git a/FindVjsw.cmake b/FindVjsw.cmake index a7049e6ba03de5e0788d8db4e14322e6693a8619..09bc51bf1a1cfd3d79b9fc44beac5cc229df6a04 100644 --- a/FindVjsw.cmake +++ b/FindVjsw.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVlua.cmake b/FindVlua.cmake index 022d27f0599199ed36be730f7dfaf5022a3af0e7..bfaca150e6c96461baf85d5b593707ef3f75dc31 100644 --- a/FindVlua.cmake +++ b/FindVlua.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVmpfr.cmake b/FindVmpfr.cmake index 1236a9d2a0f947608fe83f83de0d15a9fe94f25d..64198e76d2622db5ab15ccbbf978f51b5545f3a0 100644 --- a/FindVmpfr.cmake +++ b/FindVmpfr.cmake @@ -1,4 +1,4 @@ -# $Id: FindVMPFR.cmake 35232 2013-05-27 13:16:20Z cn276793 $ + include( FindPackageHandleStandardArgs ) diff --git a/FindVrecast.cmake b/FindVrecast.cmake new file mode 100644 index 0000000000000000000000000000000000000000..adf383301382c358c91649104836d61562b19286 --- /dev/null +++ b/FindVrecast.cmake @@ -0,0 +1,25 @@ + + +include( FindPackageHandleStandardArgs ) +include( VistaFindUtils ) + +if( NOT VRECAST_FOUND ) + + vista_find_package_root( RECAST include/Recast.h ) + + if( RECAST_ROOT_DIR ) + find_library( RECAST_LIBRARIES NAMES Recast recast.lib + PATHS ${RECAST_ROOT_DIR}/lib + CACHE "recast library" ) + mark_as_advanced( RECAST_LIBRARIES ) + + set( RECAST_INCLUDE_DIRS ${RECAST_ROOT_DIR}/include ) + set( RECAST_LIBRARY_DIRS ${RECAST_ROOT_DIR}/lib ) + get_filename_component( RECAST_LIBRARY_DIRS ${RECAST_LIBRARIES} PATH ) + + endif( RECAST_ROOT_DIR ) + +endif( NOT VRECAST_FOUND ) + +find_package_handle_standard_args( Vrecast "recast could not be found" RECAST_ROOT_DIR ) + diff --git a/FindVsndfile.cmake b/FindVsndfile.cmake index 99e88c5f1bd20c81e8122369a20dd83a6f48db35..548f0f3c4f236a746b5a4af1d6e2f45afe8ce879 100644 --- a/FindVsndfile.cmake +++ b/FindVsndfile.cmake @@ -1,4 +1,4 @@ -# $Id: FindVSNDFILE.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVteem.cmake b/FindVteem.cmake index b8cd3dfd269f2cf3dbbb137b8d7aff3188950849..eb12c4128830c5057c22abd825194ccbf3441d22 100644 --- a/FindVteem.cmake +++ b/FindVteem.cmake @@ -1,4 +1,4 @@ -# $Id $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVtetgen.cmake b/FindVtetgen.cmake index 8b627b080b723063cdd8dcff1f98a401ca59b2f8..fbadd2a20e0237b0ea50779838bc3e41d10db3c1 100644 --- a/FindVtetgen.cmake +++ b/FindVtetgen.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVtolua++.cmake b/FindVtolua++.cmake index 509f836ef7a9946ed3911da67fbfbddce1b95b16..e557b257708fe117f6e9c3cbb70a63ef3c5c1424 100644 --- a/FindVtolua++.cmake +++ b/FindVtolua++.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVvrpn.cmake b/FindVvrpn.cmake index 69c88619bbf5f5ad16742f70427a570de0b82e1e..80912f906a3958a97d6ad4fd62295f92256a009d 100644 --- a/FindVvrpn.cmake +++ b/FindVvrpn.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVwebsocketpp.cmake b/FindVwebsocketpp.cmake index f2095fd5f6ef5f0dfc807b5e8201143efd74d904..b1d2219e5fca24a2a29517c744ac08dcb6d81bd2 100644 --- a/FindVwebsocketpp.cmake +++ b/FindVwebsocketpp.cmake @@ -1,4 +1,4 @@ -# $Id: FindVChai3D.cmake 21495 2011-05-25 07:52:18Z dr165799 $ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/FindVwiiuse.cmake b/FindVwiiuse.cmake index e60dca5d82af492b8af9a07f0f97e66cecd2fa18..e33225d3f8fdeed48b138376e5c5da96684ea18a 100644 --- a/FindVwiiuse.cmake +++ b/FindVwiiuse.cmake @@ -1,4 +1,4 @@ -# $Id$ + include( FindPackageHandleStandardArgs ) include( VistaFindUtils ) diff --git a/VOpenMPUseFile.cmake b/VOpenMPUseFile.cmake index f7f522d405ffdfb5f9af4bec3cdf7d777c5ae8c5..1b01ff4829a1b6a3e9f931543313e7aec70d7bef 100644 --- a/VOpenMPUseFile.cmake +++ b/VOpenMPUseFile.cmake @@ -1,4 +1,4 @@ -# $Id: FindVGLEW.cmake 21620 2011-05-30 10:28:48Z dr165799 $ + if( NOT VOPENMP_FOUND ) message( FATAL_ERROR "OpenMPUseFile included although OpenMP was not found" ) diff --git a/VistaCommon.cmake b/VistaCommon.cmake index 7eaa74a2008d2e214f9e024f6eb72719b330a8c3..cc0fef2ea5922d62e1e6615452ec88f7617276d2 100644 --- a/VistaCommon.cmake +++ b/VistaCommon.cmake @@ -1,9 +1,9 @@ -# $Id$ + # This file contains common settings and macros for setting up Vista projects # PACKAGE MACROS: -# vista_add_external_msvc_project_of_package( PACKAGE_NAME [SOLUTION_FOLDER] [DEPENDENT (DENENDENT_TARGET)+ ] [ DEPENDS (DEPENDANT_TRAGET)+ ] ) +# vista_add_external_msvc_project_of_package( PACKAGE_NAME [SOLUTION_FOLDER] [DEPENDENT (DEPENDENT_TARGET)+ ] [ DEPENDS (DEPENDENT_TRAGET)+ ] ) # vista_find_package( <package> [version] [EXACT] [QUIET] [[REQUIRED|COMPONENTS] [components...]] [NO_POLICY_SCOPE] [NO_MODULE] ) # vista_use_package( <package> [version] [EXACT] [QUIET] [[REQUIRED|COMPONENTS] [components...]] [NO_POLICY_SCOPE] [NO_MODULE] [FIND_DEPENDENCIES] [SYSTEM_HEADERS] ) # vista_find_shader_dirs( PACKAGE_NAME ) @@ -332,7 +332,7 @@ endmacro() ########################### -# vista_add_external_msvc_project_of_package( PACKAGE_NAME [SOLUTION_FOLDER] [DEPENDENT (DENENDENT_TARGET)+ ] [ DEPENDS (DEPENDANT_TRAGET)+ ] [SILENT | WARNING | ERROR] ) +# vista_add_external_msvc_project_of_package( PACKAGE_NAME [SOLUTION_FOLDER] [DEPENDENT (DEPENDENT_TARGET)+ ] [ DEPENDS (DEPENDENT_TRAGET)+ ] [SILENT | WARNING | ERROR] ) # Adds msvc projects that were exported by a package to the solution (Visual Studio only) # note: the targets will NOT be named by their original name, but # instead external_NAME, to prevent name clashes (e.g. with included libraries) @@ -972,8 +972,8 @@ macro( vista_use_package _PACKAGE_NAME ) endmacro() # vista_find_shader_dirs( PACKAGE_NAME ) -# serches recursive for all subdirectories of CURRENT_SOURCE_DIR that contain shader files and -# adds them to the list of shader-directoriey. +# searches recursively for all subdirectories of CURRENT_SOURCE_DIR that contain shader files and +# adds them to the list of shader directories macro( vista_find_shader_dirs _PACKAGE_NAME ) string( TOUPPER ${_PACKAGE_NAME} _PACKAGE_NAME_UPPER ) @@ -1115,7 +1115,7 @@ macro( vista_configure_app _PACKAGE_NAME ) endif() set( _ENVVARNAME "" ) foreach( _ENTRY ${VISTA_ENVVARS} ${VISTA_${_PACKAGE_NAME}_ENVVARS} ) - if( "${_ENVVARNAME}" STREQUAL "" ) + if( "${${_ENVVARNAME}}" STREQUAL "" ) set( _ENVVARNAME ${_ENTRY} ) else() set( _ENTRIES "${_ENTRIES}export ${_ENVVARNAME}=${_ENTRY}\n" ) diff --git a/VistaFindUtils.cmake b/VistaFindUtils.cmake index aba860c9727542255284988e15af34cfe7a6c693..dec439620a8d875cef6e5f99137f03879b4995a9 100644 --- a/VistaFindUtils.cmake +++ b/VistaFindUtils.cmake @@ -1,4 +1,4 @@ -# $Id$ + # defines list VISTA_PACKAGE_SEARCH_PATHS that contains pathes where packages can be found # defines utilitiy macros for finding packages/directories and checking versions # vista_check_version_entry( INPUT_VERSION OWN_VERSION DIFFERENCE_VAR ) diff --git a/VistaHWArchSettings.cmake b/VistaHWArchSettings.cmake index 7901707e2139ff505ed2ff3a4850711ddf8a0ec6..2e3e047f83fb3c303d60bbc25c0d86852d869085 100644 --- a/VistaHWArchSettings.cmake +++ b/VistaHWArchSettings.cmake @@ -1,4 +1,4 @@ -# $Id$ + # Defines Vista_specific variables that describe the hardware architecture and compiler # throws a warning when the current architecture is not supported diff --git a/VistaTestingUtils.cmake b/VistaTestingUtils.cmake index 73671badc5ffafe49d47d82e979b39a2f4cc7cc3..07ffbbfd7d78243bf568c3959c67473f4169fcde 100644 --- a/VistaTestingUtils.cmake +++ b/VistaTestingUtils.cmake @@ -1,4 +1,4 @@ -# $Id$ + # This file contains common settings and macros for setting up Vista projects #