From 0fa7b79f6d193777e21d4b6279ccff83f9390eb5 Mon Sep 17 00:00:00 2001 From: gerrit Date: Fri, 27 May 2016 13:35:39 +0200 Subject: [PATCH] fixed: win vs2015 build --- Source/Contrib/CgFXMaterial/CMake/FindCg.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Contrib/CgFXMaterial/CMake/FindCg.cmake b/Source/Contrib/CgFXMaterial/CMake/FindCg.cmake index df8edb714..d9fb6f31d 100644 --- a/Source/Contrib/CgFXMaterial/CMake/FindCg.cmake +++ b/Source/Contrib/CgFXMaterial/CMake/FindCg.cmake @@ -37,21 +37,25 @@ ELSE(APPLE) SET(CG_NAMES_RELEASE ${CG_NAMES_RELEASE} Cg) FIND_LIBRARY(CG_LIBRARY_RELEASE NAMES ${CG_NAMES_RELEASE} + NO_DEFAULT_PATH PATHS ${CG_ROOT} ENV CG_ROOT PATH_SUFFIXES ${_OSG_CG_PATH_SUFFIXES}) SET(CG_NAMES_DEBUG ${CG_NAMES_DEBUG} Cgd) FIND_LIBRARY(CG_LIBRARY_DEBUG NAMES ${CG_NAMES_DEBUG} + NO_DEFAULT_PATH PATHS ${CG_ROOT} ENV CG_ROOT PATH_SUFFIXES ${_OSG_CG_PATH_SUFFIXES}) SET(CG_GL_NAMES_RELEASE ${CG_GL_NAMES_RELEASE} CgGL) FIND_LIBRARY(CG_GL_LIBRARY_RELEASE NAMES ${CG_GL_NAMES_RELEASE} + NO_DEFAULT_PATH PATHS ${CG_ROOT} ENV CG_ROOT PATH_SUFFIXES ${_OSG_CG_PATH_SUFFIXES}) SET(CG_GL_NAMES_DEBUG ${CG_GL_NAMES_DEBUG} CgGLd) FIND_LIBRARY(CG_GL_LIBRARY_DEBUG NAMES ${CG_GL_NAMES_DEBUG} + NO_DEFAULT_PATH PATHS ${CG_ROOT} ENV CG_ROOT PATH_SUFFIXES ${_OSG_CG_PATH_SUFFIXES}) ENDIF (APPLE) -- 2.11.4.GIT