cmake changes

- set python to 3.1 on linux (dont use FindPackage for now)
- remove duplicate settings (disable cache for copied settings, was quite confusing)
- added an option WITH_INSTALL, when disabled scripts and language files wont be copied to the target dir (better for quick builds)
- remove .svn (was still CVS), and pyc/pyc files after copy
- copy the 'io' as well as 'ui'

1 files changed, 51 insertions, 25 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb2d336c747..9e552be8616 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,7 @@ OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
 OPTION(WITH_FFTW3		"Enable FFTW3 support"				OFF)
+OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -96,6 +97,8 @@ IF(UNIX AND NOT APPLE)
       SET(WITH_OPENAL ON)
       SET(OPENAL_LIB ${OPENAL_LIBRARY})
       SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
+      UNSET(OPENAL_LIBRARY CACHE)
+      UNSET(OPENAL_INCLUDE_DIR CACHE)
     ELSE(OPENAL_FOUND)
       SET(WITH_OPENAL OFF)
     ENDIF(OPENAL_FOUND)
@@ -111,6 +114,7 @@ IF(UNIX AND NOT APPLE)
     PATHS
     /sw/lib
   )
+  
   IF(INTL_LIBRARY AND ICONV_LIBRARY)
     SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
   ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
@@ -118,18 +122,35 @@ IF(UNIX AND NOT APPLE)
   FIND_PACKAGE(Freetype)
   SET(FREETYPE_INC "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE STRING "")
   SET(FREETYPE_LIB "${FREETYPE_LIBRARY}" CACHE STRING "")
+  UNSET(FREETYPE_INCLUDE_DIR_freetype2 CACHE)
+  UNSET(FREETYPE_LIBRARY CACHE)
+  UNSET(FREETYPE_INCLUDE_DIR_ft2build CACHE)
 
-  FIND_PACKAGE(PythonLibs)
-  SET(PYTHON_INC "${PYTHON_INCLUDE_PATH}" CACHE STRING "")
-  SET(PYTHON_LIB "${PYTHON_LIBRARIES}" CACHE STRING "")
-  FIND_PACKAGE(PythonInterp)
-  SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+  # No way to set py31. remove for now.
+  # FIND_PACKAGE(PythonLibs)
+  SET(PYTHON /usr)
+  SET(PYTHON_VERSION 3.1)
+  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+  # SET(PYTHON_BINARY python) # not used yet
+  SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+  SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+  
+  # FIND_PACKAGE(PythonInterp) # not used yet
+  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+  
   SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
   IF(WITH_SDL)
     FIND_PACKAGE(SDL)
-    SET(SDL_INC ${SDL_INCLUDE_DIR})
-    SET(SDL_LIB ${SDL_LIBRARY})
+    IF(SDL_FOUND)
+      SET(SDL_INC ${SDL_INCLUDE_DIR})
+      SET(SDL_LIB ${SDL_LIBRARY})
+      UNSET(SDL_INCLUDE_DIR CACHE)
+      UNSET(SDL_LIBRARY CACHE)
+      UNSET(SDLMAIN_LIBRARY CACHE)
+    ELSE(SDL_FOUND)
+      SET(WITH_SDL OFF)
+    ENDIF(SDL_FOUND)
   ENDIF(WITH_SDL)
 
   FIND_PATH(OPENEXR_INC
@@ -208,22 +229,22 @@ IF(WIN32)
   SET(PYTHON ${LIBDIR}/python)
   SET(PYTHON_VERSION 3.1)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-  SET(PYTHON_BINARY python)
+  # SET(PYTHON_BINARY python) # not used yet
   SET(PYTHON_LIB python31)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
   IF(CMAKE_CL_64)
     SET(WITH_OPENAL OFF)
   ELSE(CMAKE_CL_64)
-	#SET(WITH_OPENAL ON)
-	SET(OPENAL ${LIBDIR}/openal)
-	SET(OPENAL_INC ${OPENAL}/include)
-	SET(OPENAL_LIB wrap_oal)
-	SET(OPENAL_LIBPATH ${OPENAL}/lib)
+    #SET(WITH_OPENAL ON)
+    SET(OPENAL ${LIBDIR}/openal)
+    SET(OPENAL_INC ${OPENAL}/include)
+    SET(OPENAL_LIB wrap_oal)
+    SET(OPENAL_LIBPATH ${OPENAL}/lib)
   ENDIF(CMAKE_CL_64)
 
   IF(CMAKE_CL_64)
-	SET(PNG_LIBRARIES libpng)
+    SET(PNG_LIBRARIES libpng)
   ELSE(CMAKE_CL_64)
     SET(PNG_LIBRARIES libpng_st)
   ENDIF(CMAKE_CL_64)
@@ -245,18 +266,18 @@ IF(WIN32)
   SET(ICONV_LIBPATH ${ICONV}/lib)
   
   IF(WITH_FFTW3)
-	  SET(FFTW3 ${LIBDIR}/fftw3)
-	  SET(FFTW3_INC ${FFTW3}/include)
-	  SET(FFTW3_LIB libfftw)
-	  SET(FFTW3_LIBPATH ${FFTW3}/lib)
+      SET(FFTW3 ${LIBDIR}/fftw3)
+      SET(FFTW3_INC ${FFTW3}/include)
+      SET(FFTW3_LIB libfftw)
+      SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
   
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
   IF(CMAKE_CL_64)
-  	SET(GETTEXT_LIB gettextlib)
+    SET(GETTEXT_LIB gettextlib)
   ELSE(CMAKE_CL_64)
-  	SET(GETTEXT_LIB gnu_gettext)
+    SET(GETTEXT_LIB gnu_gettext)
   ENDIF(CMAKE_CL_64)
   SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
 
@@ -352,6 +373,8 @@ IF(APPLE)
       SET(WITH_OPENAL ON)
       SET(OPENAL_LIB ${OPENAL_LIBRARY})
       SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
+      UNSET(OPENAL_LIBRARY CACHE)
+      UNSET(OPENAL_INCLUDE_DIR CACHE)
     ELSE(OPENAL_FOUND)
       SET(WITH_OPENAL OFF)
     ENDIF(OPENAL_FOUND)
@@ -365,7 +388,7 @@ IF(APPLE)
 
     SET(PYTHON ${LIBDIR}/python)
     SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
+    # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
     SET(PYTHON_LIB python${PYTHON_VERSION})
     SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
     #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
@@ -375,7 +398,7 @@ IF(APPLE)
     SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
     SET(PYTHON_VERSION 2.5)
     SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
+    # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
     SET(PYTHON_LIB "")
     SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
     SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
@@ -388,9 +411,9 @@ IF(APPLE)
   
   IF(WITH_FFTW3)
     SET(FFTW3 ${LIBDIR}/fftw3)
-	SET(FFTW3_INC ${FFTW3}/include)
-	SET(FFTW3_LIB libfftw)
-	SET(FFTW3_LIBPATH ${FFTW3}/lib)
+    SET(FFTW3_INC ${FFTW3}/include)
+    SET(FFTW3_LIB libfftw)
+    SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
 
   SET(PNG_LIBRARIES png)
@@ -477,6 +500,9 @@ ENDIF(WITH_WEBPLUGIN)
 # Configure OpenGL.
 FIND_PACKAGE(OpenGL)
 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
+UNSET(OPENGL_LIBRARIES CACHE)
+UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE)
+
 #-----------------------------------------------------------------------------
 # Extra compile flags
 IF(WITH_GAMEENGINE)