Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Want <cwant@ualberta.ca>2009-10-29 20:57:02 +0300
committerChris Want <cwant@ualberta.ca>2009-10-29 20:57:02 +0300
commit52001f5ffbb8840399a9aa6839ee2f94b924e0e9 (patch)
treecb6c05ab721b9b6db68cabaf9e124b1dd48d798a /CMakeLists.txt
parentf979e7dab44e96473a7a78748a4c6a95a0f7c111 (diff)
Options to set OpenCollada, pcre and expat dirs (Dyussenov's test please).
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt25
1 files 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