From 78196aaaa28375ddaf3e7a3a8570941c15353cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 28 Apr 2016 11:03:48 +0200 Subject: [PATCH] Typo --- CMakeLists.txt | 5 +++++ cmake/FindGLUT.cmake | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08e6fb63..c05a6284 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,11 @@ if("${PROJECT_NAME}" STREQUAL "") project (OpenMesh) endif() +if ( WIN32 ) + # This is the base directory for windows library search used in the finders we ship. + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) +endif() + if (NOT WIN32 AND NOT CMAKE_BUILD_TYPE) message(STATUS "No build type selected, default to Release") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) diff --git a/cmake/FindGLUT.cmake b/cmake/FindGLUT.cmake index f7bfbd6a..f3a99dfc 100644 --- a/cmake/FindGLUT.cmake +++ b/cmake/FindGLUT.cmake @@ -46,7 +46,7 @@ IF (WIN32) FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h PATHS ${GLUT_ROOT_PATH}/include "${CMAKE_WINDOWS_LIBS_DIR}/glut-3.7/include" - "${VS_SEARCH_PATH}/freeglut-3.0.0/include" ) + "${VS_SEARCH_PATH}/freeglut-3.0.0/include" "${VS_SEARCH_PATH}/freeglut-2.8.1/include" ) FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut32 glut freeglut