Update cmake scripts.

cmake/DetermineProcessor.cmake

@@ -16,10 +16,43 @@ IF(UNIX)
 		STRING(REGEX REPLACE "/" "_" NV_SYSTEM_PROCESSOR "${NV_SYSTEM_PROCESSOR}")
 	ENDIF(CMAKE_UNAME)
 
-	# Get extended processor information with:
-	# `cat /proc/cpuinfo`
+#~ 	# Get extended processor information from /proc/cpuinfo
+#~ 	IF(EXISTS "/proc/cpuinfo")
+
+#~ 		FILE(READ /proc/cpuinfo PROC_CPUINFO)
+
+#~ 		SET(VENDOR_ID_RX "vendor_id[ \t]*:[ \t]*([a-zA-Z]+)\n")
+#~ 		STRING(REGEX MATCH "${VENDOR_ID_RX}" VENDOR_ID "${PROC_CPUINFO}")
+#~ 		STRING(REGEX REPLACE "${VENDOR_ID_RX}" "\\1" VENDOR_ID "${VENDOR_ID}")
+
+#~ 		SET(CPU_FAMILY_RX "cpu family[ \t]*:[ \t]*([0-9]+)")
+#~ 		STRING(REGEX MATCH "${CPU_FAMILY_RX}" CPU_FAMILY "${PROC_CPUINFO}")
+#~ 		STRING(REGEX REPLACE "${CPU_FAMILY_RX}" "\\1" CPU_FAMILY "${CPU_FAMILY}")
+
+#~ 		SET(MODEL_RX "model[ \t]*:[ \t]*([0-9]+)")
+#~ 		STRING(REGEX MATCH "${MODEL_RX}" MODEL "${PROC_CPUINFO}")
+#~ 		STRING(REGEX REPLACE "${MODEL_RX}" "\\1" MODEL "${MODEL}")
+
+#~ 		SET(FLAGS_RX "flags[ \t]*:[ \t]*([a-zA-Z0-9 _]+)\n")
+#~ 		STRING(REGEX MATCH "${FLAGS_RX}" FLAGS "${PROC_CPUINFO}")
+#~ 		STRING(REGEX REPLACE "${FLAGS_RX}" "\\1" FLAGS "${FLAGS}")
+
+#~ 		# Debug output.
+#~ 		IF(LINUX_CPUINFO)
+#~ 			MESSAGE(STATUS "LinuxCPUInfo.cmake:")
+#~ 			MESSAGE(STATUS "VENDOR_ID : ${VENDOR_ID}")
+#~ 			MESSAGE(STATUS "CPU_FAMILY : ${CPU_FAMILY}")
+#~ 			MESSAGE(STATUS "MODEL : ${MODEL}")
+#~ 			MESSAGE(STATUS "FLAGS : ${FLAGS}")
+#~ 		ENDIF(LINUX_CPUINFO)
+
+#~ 	ENDIF(EXISTS "/proc/cpuinfo")
+
+#~		# Information on how to decode CPU_FAMILY and MODEL:
+#~		# http://balusc.xs4all.nl/srv/har-cpu-int-pm.php
 
 ELSE(UNIX)
+
   IF(WIN32)
     # It's not OK to trust $ENV{PROCESSOR_ARCHITECTURE}: its value depends on the type of executable being run,
 	# so a 32-bit cmake (the default binary distribution) will always say "x86" regardless of the actual target.
@@ -29,6 +62,7 @@ ELSE(UNIX)
 	  SET (NV_SYSTEM_PROCESSOR "x86")
 	ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
   ENDIF(WIN32)
+
 ENDIF(UNIX)
 
 

cmake/FindFreeImage.cmake

@@ -9,12 +9,14 @@
 
 IF (WIN32)
 	FIND_PATH( FREEIMAGE_INCLUDE_PATH FreeImage.h
-		${PROJECT_SOURCE_DIR}/extern/FreeImage
+		${FREEIMAGE_ROOT_DIR}/include
+		${FREEIMAGE_ROOT_DIR}
 		DOC "The directory where FreeImage.h resides")
 	FIND_LIBRARY( FREEIMAGE_LIBRARY
 		NAMES FreeImage freeimage
 		PATHS
-		${PROJECT_SOURCE_DIR}/FreeImage
+		${FREEIMAGE_ROOT_DIR}/lib
+		${FREEIMAGE_ROOT_DIR}
 		DOC "The FreeImage library")
 ELSE (WIN32)
 	FIND_PATH( FREEIMAGE_INCLUDE_PATH FreeImage.h
@@ -38,9 +40,9 @@ ENDIF (WIN32)
 SET(FREEIMAGE_LIBRARIES ${FREEIMAGE_LIBRARY})
 
 IF (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
-	SET( FREEIMAGE_FOUND TRUE CACHE BOOL "Set to TRUE if GLEW is found, FALSE otherwise")
+	SET( FREEIMAGE_FOUND TRUE CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
 ELSE (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
-	SET( FREEIMAGE_FOUND FALSE CACHE BOOL "Set to TRUE if GLEW is found, FALSE otherwise")
+	SET( FREEIMAGE_FOUND FALSE CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
 ENDIF (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
 
 MARK_AS_ADVANCED(