TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix libCgGL linkage in FindCg.cmake

Browse Source 
This involves both fixing the capitalization of "CgGL" and only adding
libraries to CG_LIBRARIES when they're found.
This commit is contained in:
Sam Edwards 2018-11-05 17:54:45 -07:00
parent e604d71fbc
commit 16be0770e7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/modules/FindCg.cmake
View File

@ -42,7 +42,7 @@ macro(find_cggl)
# Find the library directory
find_library(CGGL_LIBRARY
NAMES "cgGL" "libCgGL"
NAMES "CgGL" "libCgGL"
PATHS "C:/Program Files/Cg"
"C:/Program Files/NVIDIA Corporation/Cg"
"/usr"
@ -87,7 +87,7 @@ macro(find_cgd3d9)
# Find the library directory
find_library(CGD3D9_LIBRARY
NAMES "cgD3D9" "libCgD3D9"
NAMES "CgD3D9" "libCgD3D9"
PATHS "C:/Program Files/Cg"
"C:/Program Files/NVIDIA Corporation/Cg"
"/usr"
@ -184,6 +184,11 @@ if(CG_INCLUDE_DIR AND CG_LIBRARY_DIR)
find_cggl()
find_cgd3d9()
set(CG_LIBRARIES ${CG_LIBRARY} ${CGGL_LIBRARY} ${CGD3D9_LIBRARY})
mark_as_advanced(CG_LIBRARIES)
set(CG_LIBRARIES ${CG_LIBRARY})
if(CGGL_LIBRARY)
list(APPEND CG_LIBRARIES "${CGGL_LIBRARY}")
endif()
if(CGD3D9_LIBRARY)
list(APPEND CG_LIBRARIES "${CGD3D9_LIBRARY}")
endif()
endif()