From 236e773fc57db5d97c057832b113e07363c00483 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 15 Mar 2011 14:02:39 +0000
Subject: [PATCH] From Torben Dannhauer, update to reflect addition of NVTT to
 Windows 3rdPartyPackage

---
 CMakeModules/Find3rdPartyDependencies.cmake | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/CMakeModules/Find3rdPartyDependencies.cmake b/CMakeModules/Find3rdPartyDependencies.cmake
index 7be43bb65..516e7355b 100644
--- a/CMakeModules/Find3rdPartyDependencies.cmake
+++ b/CMakeModules/Find3rdPartyDependencies.cmake
@@ -92,6 +92,8 @@ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
             SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} CACHE FILEPATH "" FORCE)
             SET(LIBXML2_XMLLINT_EXECUTABLE ${OSG_3RDPARTY_BIN}/bin/xmllint.exe CACHE FILEPATH "Path to xmllint executable" FORCE)
         ENDIF(LIBXML2_FOUND)
+        #FIND_DEPENDENCY(DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBUGSUFFIX EXSUFFIX)
+        FIND_Package(NVTT)  
 #luigi#INCLUDE(FindOSGDepends.cmake)
 ENDMACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
 
@@ -104,10 +106,25 @@ ENDMACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
 
 OPTION(USE_3DPARTY_BIN "Set to ON to use Mike prebuilt dependencies situated side of OpenSceneGraph source.  Use OFF for avoiding." ON)
 IF(USE_3DPARTY_BIN)
+
+    # Check Architecture
+    IF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+        MESSAGE( STATUS "32 bit architecture detected" )
+        SET(DESTINATION_ARCH "x86")
+    ENDIF()
+    IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+        MESSAGE( STATUS "64 bit architecture detected" )
+        SET(DESTINATION_ARCH "x64")
+    ENDIF()
+
     GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
     SET(TEST_3DPARTY_DIR "${PARENT_DIR}/3rdparty")
     IF(NOT EXISTS ${TEST_3DPARTY_DIR})
-        IF(MSVC71)
+        SET(3RDPARTY_DIR_BY_ENV $ENV{OSG_3RDPARTY_DIR})
+        IF(3RDPARTY_DIR_BY_ENV)
+            MESSAGE( STATUS "3rdParty-Package ENV variable found:${3RDPARTY_DIR_BY_ENV}/${DESTINATION_ARCH}" )
+            SET(TEST_3DPARTY_DIR "${3RDPARTY_DIR_BY_ENV}/${DESTINATION_ARCH}")
+        ELSEIF(MSVC71)
             SET(TEST_3DPARTY_DIR "${PARENT_DIR}/3rdParty_win32binaries_vs71")
         ELSEIF(MSVC80)
             SET(TEST_3DPARTY_DIR "${PARENT_DIR}/3rdParty_win32binaries_vs80sp1")
@@ -117,6 +134,7 @@ IF(USE_3DPARTY_BIN)
     ENDIF(NOT EXISTS ${TEST_3DPARTY_DIR})
     SET(ACTUAL_3DPARTY_DIR "${TEST_3DPARTY_DIR}" CACHE PATH "Location of 3rdparty dependencies")
     IF(EXISTS ${ACTUAL_3DPARTY_DIR})
+        SET (3rdPartyRoot ${ACTUAL_3DPARTY_DIR})
         SEARCH_3RDPARTY(${ACTUAL_3DPARTY_DIR})
     ENDIF(EXISTS ${ACTUAL_3DPARTY_DIR})
 ENDIF(USE_3DPARTY_BIN)