From 594d43db8482a07915a769086b5f5e321c387b1c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 6 Mar 2014 17:41:14 -0800 Subject: [PATCH] add a find module for glew and tweak glm module --- cmake/modules/FindGLM.cmake | 1 + interface/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake index 764e62f9c2..ebc1c5f817 100644 --- a/cmake/modules/FindGLM.cmake +++ b/cmake/modules/FindGLM.cmake @@ -49,6 +49,7 @@ ELSE (GLM_INCLUDE_DIR) IF(GLM_ROOT_DIR) SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" "${GLM_ROOT_DIR}/include" + "$ENV{HIFI_LIB_DIR}" ${_glm_HEADER_SEARCH_DIRS}) ENDIF(GLM_ROOT_DIR) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 4351fc9b24..4a31bd6ee8 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -233,6 +233,6 @@ else (APPLE) if (WIN32) find_package(GLEW REQUIRED) include_directories(${GLEW_INCLUDE_DIRS}) - target_link_libraries(${TARGET_NAME} "${GLUT_LIBRARY}" "${GLEW_LIBRARIES}" wsock32.lib opengl32.lib) + target_link_libraries(${TARGET_NAME} "${GLUT_LIBRARY}" "${GLEW_LIBRARY}" wsock32.lib opengl32.lib) endif() endif (APPLE) \ No newline at end of file