[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37459] trunk/blender: cmake: correct uninitialized vars

[Campbell Barton]

Revision: 37459
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37459
Author:   campbellbarton
Date:     2011-06-14 00:24:50 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
cmake: correct uninitialized vars

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake
    trunk/blender/build_files/cmake/macros.cmake

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-06-13 21:35:24 UTC (rev 37458)
+++ trunk/blender/CMakeLists.txt	2011-06-14 00:24:50 UTC (rev 37459)
@@ -223,9 +223,6 @@
 	set(WITH_HEADLESS ON)
 endif()
 
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
 TEST_SSE_SUPPORT()
 
 #-----------------------------------------------------------------------------
@@ -234,6 +231,9 @@
 # linux only, not cached
 set(WITH_BINRELOC OFF)
 
+# MAXOSX only, set to avoid uninitialized 
+set(EXETYPE "")
+
 # these are added to later on.
 set(C_WARNINGS "")
 set(CXX_WARNINGS "")

Modified: trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake	2011-06-13 21:35:24 UTC (rev 37458)
+++ trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake	2011-06-14 00:24:50 UTC (rev 37459)
@@ -18,10 +18,18 @@
 	"m;mu;u; ")
 
 string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+
 set(_Python_PATHS
-  "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}" "/opt/py${_PYTHON_VERSION_NO_DOTS}" "/usr" "/usr/local")
+	"$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
+	"/opt/py${_PYTHON_VERSION_NO_DOTS}"
+	"/usr"
+	"/usr/local"
+)
 
-if(NOT DEFINED PYTHON_INCLUDE_DIRS)
+if(NOT DEFINED PYTHON_INCLUDE_DIRS OR
+   NOT DEFINED PYTHON_LIBRARY OR
+   NOT DEFINED PYTHON_LIBPATH)
+   
 	message(STATUS "Looking for include Python.h")
 	set(_Found_PYTHON_H OFF)
 
@@ -58,7 +66,15 @@
 	unset(_Python_HEADER)
 	unset(_CURRENT_ABI_FLAGS)
 	unset(_CURRENT_PATH)
-	
+
+
+	set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
+	mark_as_advanced(PYTHON_INCLUDE_DIRS)
+	set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
+	mark_as_advanced(PYTHON_LIBRARY)
+	set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	mark_as_advanced(PYTHON_LIBPATH)
+	# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
 endif()
 
 unset(_Python_ABI_FLAGS)
@@ -68,14 +84,6 @@
 # now the python versions are found
 
 
-set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
-mark_as_advanced(PYTHON_INCLUDE_DIRS)
-set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
-mark_as_advanced(PYTHON_LIBRARY)
-set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-mark_as_advanced(PYTHON_LIBPATH)
-# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-
 if(NOT EXISTS "${PYTHON_INCLUDE_DIRS}/Python.h")
 	message(FATAL_ERROR " Missing python header: ${PYTHON_INCLUDE_DIRS}/Python.h")
 endif()

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-06-13 21:35:24 UTC (rev 37458)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-06-14 00:24:50 UTC (rev 37459)
@@ -484,8 +484,8 @@
 	unset(_reset_standard_cflags_rel)
 	unset(_reset_standard_cxxflags_rel)
 
-	# --------------------------------------------------
-	# workaround for omission in cmake 2.8.4's GNU.cmake
+	# ------------------------------------------------------------------
+	# workaround for omission in cmake 2.8.4's GNU.cmake, fixed in 2.8.5
 	if(CMAKE_COMPILER_IS_GNUCC)
 		if(NOT DARWIN)
 			set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")