[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24158] branches/soc-2009-chingachgook/ CMakeLists.txt: Options to set OpenCollada, pcre and expat dirs (Dyussenov' s test please).

[Chris Want]

Revision: 24158
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24158
Author:   hos
Date:     2009-10-29 18:57:02 +0100 (Thu, 29 Oct 2009)

Log Message:
-----------
Options to set OpenCollada, pcre and expat dirs (Dyussenov's test please).

Modified Paths:
--------------
    branches/soc-2009-chingachgook/CMakeLists.txt

Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt	2009-10-29 15:54:25 UTC (rev 24157)
+++ branches/soc-2009-chingachgook/CMakeLists.txt	2009-10-29 17:57:02 UTC (rev 24158)
@@ -91,6 +91,19 @@
 	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 @@
 		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