diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad2d3a51..b1c09c54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,10 @@ set_target_properties( ${PROJECT_NAME}
 	DEBUG_POSTFIX "_d"
 )
 
-cmake_policy(SET CMP0072 NEW)
+if (POLICY CMP0072)
+       cmake_policy(SET CMP0072 NEW)
+endif()
+
 find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIR})
 target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES})
diff --git a/CMake_modules/FindGLFW3.cmake b/CMake_modules/FindGLFW3.cmake
index a92f95a8..da0525c5 100644
--- a/CMake_modules/FindGLFW3.cmake
+++ b/CMake_modules/FindGLFW3.cmake
@@ -48,7 +48,7 @@ ELSEIF(MSVC)
 ENDIF()
 
 FIND_LIBRARY(GLFW3_LIBRARIES
-  NAMES glfw3dll glfw3
+  NAMES glfw3dll glfw3 glfw
   PATHS
     "${DEPENDS_DIR}/glfw"
     "$ENV{ProgramW6432}/glfw"
diff --git a/CMake_modules/FindLuaJIT.cmake b/CMake_modules/FindLuaJIT.cmake
index b9bdcdbf..72a8a4c9 100644
--- a/CMake_modules/FindLuaJIT.cmake
+++ b/CMake_modules/FindLuaJIT.cmake
@@ -28,7 +28,7 @@
 find_path(LUAJIT_INCLUDE_DIR luajit.h
 	HINTS
 	$ENV{LUA_DIR}
-	PATH_SUFFIXES include/luajit-2.0 include
+	PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include
 	PATHS
 	~/Library/Frameworks
 	/Library/Frameworks