From 52001f5ffbb8840399a9aa6839ee2f94b924e0e9 Mon Sep 17 00:00:00 2001
From: Chris Want <cwant@ualberta.ca>
Date: Thu, 29 Oct 2009 17:57:02 +0000
Subject: [PATCH] Options to set OpenCollada, pcre and expat dirs (Dyussenov's
 test please).

---
 CMakeLists.txt | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74016128742..5cb14f37305 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,19 @@ IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+IF (WITH_OPENCOLLADA)
+SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+SET(OPENCOLLADA_LIB OpenCollada)
+SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
+SET(PCRE_LIBPATH ${PCRE}/lib)
+SET(PCRE_LIB pcre)
+SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
+SET(EXPAT_LIBPATH ${EXPAT}/lib)
+SET(EXPAT_LIB expat)
+
+ENDIF (WITH_OPENCOLLADA)
+
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
 #   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
@@ -170,18 +183,6 @@ IF(UNIX AND NOT APPLE)
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-	IF(WITH_OPENCOLLADA)
-		SET(OPENCOLLADA /usr/local/opencollada)
-		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
-		SET(OPENCOLLADA_LIB OpenCollada)
-		SET(PCRE /usr)
-		SET(PCRE_LIBPATH ${PCRE}/lib)
-		SET(PCRE_LIB pcre)
-		SET(EXPAT /usr)
-		SET(EXPAT_LIBPATH ${EXPAT}/lib)
-		SET(EXPAT_LIB expat)
-	ENDIF(WITH_OPENCOLLADA)
-
 	FIND_PATH(OPENEXR_INC
 		ImfXdr.h
 		PATHS