drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update cmake files.

Browse Source
This commit is contained in:
castano 2008-05-22 19:47:52 +00:00
parent ca8d17abf5
commit bc66a7ad74
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -6,7 +6,7 @@ SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
IF(WIN32) IF(WIN32)
SET(GNUWIN32 "${NV_SOURCE_DIR}/gnuwin32") SET(GNUWIN32 "${NV_SOURCE_DIR}/extern/gnuwin32")
SET(CMAKE_INCLUDE_PATH "${GNUWIN32}/include") SET(CMAKE_INCLUDE_PATH "${GNUWIN32}/include")
SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib") SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib")
ENDIF(WIN32) ENDIF(WIN32)

17
cmake/FindFreeImage.cmake
View File

@ -9,15 +9,12 @@
IF (WIN32) IF (WIN32)
FIND_PATH( FREEIMAGE_INCLUDE_PATH FreeImage.h FIND_PATH( FREEIMAGE_INCLUDE_PATH FreeImage.h
$ENV{PROGRAMFILES}/FreeImage/include ${PROJECT_SOURCE_DIR}/extern/FreeImage
${PROJECT_SOURCE_DIR}/FreeImage/include
DOC "The directory where FreeImage.h resides") DOC "The directory where FreeImage.h resides")
FIND_LIBRARY( FREEIMAGE_LIBRARY FIND_LIBRARY( FREEIMAGE_LIBRARY
NAMES freeimage NAMES FreeImage freeimage
PATHS PATHS
$ENV{PROGRAMFILES}/FreeImage/lib ${PROJECT_SOURCE_DIR}/FreeImage
${PROJECT_SOURCE_DIR}/FreeImage/bin
${PROJECT_SOURCE_DIR}/FreeImage/lib
DOC "The FreeImage library") DOC "The FreeImage library")
ELSE (WIN32) ELSE (WIN32)
FIND_PATH( FREEIMAGE_INCLUDE_PATH GL/glew.h FIND_PATH( FREEIMAGE_INCLUDE_PATH GL/glew.h
@ -27,7 +24,7 @@ ELSE (WIN32)
/opt/local/include /opt/local/include
DOC "The directory where FreeImage.h resides") DOC "The directory where FreeImage.h resides")
FIND_LIBRARY( FREEIMAGE_LIBRARY FIND_LIBRARY( FREEIMAGE_LIBRARY
NAMES freeimage NAMES FreeImage freeimage
PATHS PATHS
/usr/lib64 /usr/lib64
/usr/lib /usr/lib
@ -40,11 +37,11 @@ ENDIF (WIN32)
SET(FREEIMAGE_LIBRARIES ${FREEIMAGE_LIBRARY}) 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") 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") 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( MARK_AS_ADVANCED(
FREEIMAGE_FOUND FREEIMAGE_FOUND