FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged NVTT cmake fixes from 3.4 branch

Browse Source
This commit is contained in:
Robert Osfield 2018-01-11 09:39:27 +00:00
parent 0cee5f5d27
commit 7d311915e7
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
CMakeModules/FindNVTT.cmake
View File

@ -16,7 +16,7 @@ FIND_PATH(NVTT_INCLUDE_DIR nvtt/nvtt.h
)
# NVTT
FIND_LIBRARY(NVTT_LIBRARY
FIND_LIBRARY(NVTT_LIBRARY_RELEASE
NAMES nvtt
PATHS
/usr/local
@ -37,7 +37,7 @@ FIND_LIBRARY(NVTT_LIBRARY_DEBUG
)
# NVIMAGE
FIND_LIBRARY(NVIMAGE_LIBRARY
FIND_LIBRARY(NVIMAGE_LIBRARY_RELEASE
NAMES nvimage
PATHS
/usr/local
@ -58,7 +58,7 @@ FIND_LIBRARY(NVIMAGE_LIBRARY_DEBUG
)
# NVMATH
FIND_LIBRARY(NVMATH_LIBRARY
FIND_LIBRARY(NVMATH_LIBRARY_RELEASE
NAMES nvmath
PATHS
/usr/local
@ -79,7 +79,7 @@ FIND_LIBRARY(NVMATH_LIBRARY_DEBUG
)
# NVCORE
FIND_LIBRARY(NVCORE_LIBRARY
FIND_LIBRARY(NVCORE_LIBRARY_RELEASE
NAMES nvcore
PATHS
/usr/local
@ -99,7 +99,7 @@ FIND_LIBRARY(NVCORE_LIBRARY_DEBUG
)
# NVTHREAD
FIND_LIBRARY(NVTHREAD_LIBRARY
FIND_LIBRARY(NVTHREAD_LIBRARY_RELEASE
NAMES nvthread
PATHS
/usr/local
@ -119,7 +119,7 @@ FIND_LIBRARY(NVTHREAD_LIBRARY_DEBUG
)
# SQUISH
FIND_LIBRARY(NVSQUISH_LIBRARY
FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE
NAMES squish
PATHS
/usr/local
@ -139,7 +139,7 @@ FIND_LIBRARY(NVSQUISH_LIBRARY_DEBUG
)
# BC6H
FIND_LIBRARY(NVBC6H_LIBRARY
FIND_LIBRARY(NVBC6H_LIBRARY_RELEASE
NAMES bc6h
PATHS
/usr/local
@ -159,7 +159,7 @@ FIND_LIBRARY(NVBC6H_LIBRARY_DEBUG
)
# BC7
FIND_LIBRARY(NVBC7_LIBRARY
FIND_LIBRARY(NVBC7_LIBRARY_RELEASE
NAMES bc7
PATHS
/usr/local
@ -178,9 +178,29 @@ FIND_LIBRARY(NVBC7_LIBRARY_DEBUG
PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
)
SET(LIBS_TO_SETUP "NVTT" "NVCORE" "NVMATH" "NVIMAGE" "NVTHREAD" "NVBC7" "NVBC6H" "NVSQUISH")
FOREACH(LIB ${LIBS_TO_SETUP})
IF(${LIB}_LIBRARY_DEBUG)
SET(${LIB}_LIBRARIES optimized ${${LIB}_LIBRARY_RELEASE} debug ${${LIB}_LIBRARY_DEBUG})
ELSE(${LIB}_LIBRARY_DEBUG)
SET(${LIB}_LIBRARY_DEBUG ${${LIB}_LIBRARY_RELEASE})
SET(${LIB}_LIBRARIES optimized ${${LIB}_LIBRARY_RELEASE} debug ${${LIB}_LIBRARY_DEBUG})
ENDIF(${LIB}_LIBRARY_DEBUG)
ENDFOREACH(LIB ${LIBS_TO_SETUP})
SET(NVTT_LIBRARIES
${NVTT_LIBRARIES}
${NVCORE_LIBRARIES}
${NVMATH_LIBRARIES}
${NVIMAGE_LIBRARIES}
${NVTHREAD_LIBRARIES}
${NVBC7_LIBRARIES}
${NVBC6H_LIBRARIES}
${NVSQUISH_LIBRARIES}
)
SET(NVTT_FOUND "NO")
IF(NVTT_LIBRARY AND NVTT_INCLUDE_DIR)
SET(NVTT_FOUND "YES")
ENDIF(NVTT_LIBRARY AND NVTT_INCLUDE_DIR)
IF(NVTT_LIBRARY_RELEASE AND NVTT_INCLUDE_DIR)
SET(NVTT_FOUND "YES" )
ENDIF(NVTT_LIBRARY_RELEASE AND NVTT_INCLUDE_DIR)

2
src/osgPlugins/nvtt/CMakeLists.txt
View File

@ -5,7 +5,7 @@ SET(TARGET_SRC
NVTTImageProcessor.cpp
)
SET(TARGET_LIBRARIES_VARS NVTT_LIBRARY)
SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ${NVTT_LIBRARIES})
#### end var setup ###
SETUP_PLUGIN(nvtt)