Options to set OpenCollada, pcre and expat dirs (Dyussenov's test please).
authorChris Want <cwant@ualberta.ca>
Thu, 29 Oct 2009 17:57:02 +0000 (17:57 +0000)
committerChris Want <cwant@ualberta.ca>
Thu, 29 Oct 2009 17:57:02 +0000 (17:57 +0000)
CMakeLists.txt

index 740161287422913bfab5bd96ad56b8e8fe92fefb..5cb14f373050eb36da2395d4fd988991000940b2 100644 (file)
@@ -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