From bc66a7ad748f5f944c41bf1451eda8a51c12718c Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Thu, 22 May 2008 19:47:52 +0000
Subject: [PATCH] Update cmake files.

---
 CMakeLists.txt            |  2 +-
 cmake/FindFreeImage.cmake | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33adb31..4f1e86c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
 
 IF(WIN32)
-	SET(GNUWIN32 "${NV_SOURCE_DIR}/gnuwin32")
+	SET(GNUWIN32 "${NV_SOURCE_DIR}/extern/gnuwin32")
 	SET(CMAKE_INCLUDE_PATH "${GNUWIN32}/include")
 	SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib")
 ENDIF(WIN32)
diff --git a/cmake/FindFreeImage.cmake b/cmake/FindFreeImage.cmake
index df9e3ae..ec21abc 100644
--- a/cmake/FindFreeImage.cmake
+++ b/cmake/FindFreeImage.cmake
@@ -9,15 +9,12 @@
 
 IF (WIN32)
 	FIND_PATH( FREEIMAGE_INCLUDE_PATH FreeImage.h
-		$ENV{PROGRAMFILES}/FreeImage/include
-		${PROJECT_SOURCE_DIR}/FreeImage/include
+		${PROJECT_SOURCE_DIR}/extern/FreeImage
 		DOC "The directory where FreeImage.h resides")
 	FIND_LIBRARY( FREEIMAGE_LIBRARY
-		NAMES freeimage
+		NAMES FreeImage freeimage
 		PATHS
-		$ENV{PROGRAMFILES}/FreeImage/lib
-		${PROJECT_SOURCE_DIR}/FreeImage/bin
-		${PROJECT_SOURCE_DIR}/FreeImage/lib
+		${PROJECT_SOURCE_DIR}/FreeImage
 		DOC "The FreeImage library")
 ELSE (WIN32)
 	FIND_PATH( FREEIMAGE_INCLUDE_PATH GL/glew.h
@@ -27,7 +24,7 @@ ELSE (WIN32)
 		/opt/local/include
 		DOC "The directory where FreeImage.h resides")
 	FIND_LIBRARY( FREEIMAGE_LIBRARY
-		NAMES freeimage
+		NAMES FreeImage freeimage
 		PATHS
 		/usr/lib64
 		/usr/lib
@@ -40,11 +37,11 @@ ENDIF (WIN32)
 
 SET(FREEIMAGE_LIBRARIES ${FREEIMAGE_LIBRARY})
 
-IF (FREEIMAGE_INCLUDE_PATH)
+IF (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
 	SET( FREEIMAGE_FOUND TRUE CACHE BOOL "Set to TRUE if GLEW is found, FALSE otherwise")
-ELSE (FREEIMAGE_INCLUDE_PATH)
+ELSE (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
 	SET( FREEIMAGE_FOUND FALSE CACHE BOOL "Set to TRUE if GLEW is found, FALSE otherwise")
-ENDIF (FREEIMAGE_INCLUDE_PATH)
+ENDIF (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
 
 MARK_AS_ADVANCED(
 	FREEIMAGE_FOUND