Merge branch 'master' into multi-monitor

This commit is contained in:
Camilla Berglund 2012-09-12 21:47:04 +02:00
commit d3a2d268f6

View File

@ -17,7 +17,10 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
find_package(OpenGL REQUIRED)
if (NOT WIN32)
set(CMAKE_THREAD_PREFER_PTHREADS YES)
endif()
find_package(Threads)
if (CMAKE_THREAD_LIBS_INIT)
list(APPEND glfw_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})