Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:57:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a find module for glew and tweak glm module

Browse source
This commit is contained in:
Stephen Birarda 2014-03-06 17:41:14 -08:00
parent cfc55c0435
commit 594d43db84
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/modules/FindGLM.cmake
View file

@ -49,6 +49,7 @@ ELSE (GLM_INCLUDE_DIR)
IF(GLM_ROOT_DIR) IF(GLM_ROOT_DIR)
SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}"
"${GLM_ROOT_DIR}/include" "${GLM_ROOT_DIR}/include"
"$ENV{HIFI_LIB_DIR}"
${_glm_HEADER_SEARCH_DIRS}) ${_glm_HEADER_SEARCH_DIRS})
ENDIF(GLM_ROOT_DIR) ENDIF(GLM_ROOT_DIR)

2
interface/CMakeLists.txt
View file

@ -233,6 +233,6 @@ else (APPLE)
if (WIN32) if (WIN32)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
include_directories(${GLEW_INCLUDE_DIRS}) 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()
endif (APPLE) endif (APPLE)