4 files changed, 71 insertions, 96 deletions
diff --git a/cmake/Modules/FindCURL.cmake b/cmake/Modules/FindCURL.cmake
index 2ec866ef9..43aaf3e18 100644
--- a/cmake/Modules/FindCURL.cmake
+++ b/cmake/Modules/FindCURL.cmake
@@ -1,19 +1,16 @@
 mark_as_advanced(CURL_LIBRARY CURL_INCLUDE_DIR)
 
-find_library(CURL_LIBRARY NAMES curl)
+find_library(CURL_LIBRARY NAMES curl libcurl)
 find_path(CURL_INCLUDE_DIR NAMES curl/curl.h)
 
-set(CURL_REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR)
-
 if(WIN32)
-	find_file(CURL_DLL NAMES libcurl-4.dll
-		PATHS
-		"C:/Windows/System32"
-		DOC "Path to the cURL DLL (for installation)")
-	mark_as_advanced(CURL_DLL)
-	set(CURL_REQUIRED_VARS ${CURL_REQUIRED_VARS} CURL_DLL)
+	# If VCPKG_APPLOCAL_DEPS is ON, dll's are automatically handled by VCPKG
+	if(NOT VCPKG_APPLOCAL_DEPS)
+		find_file(CURL_DLL NAMES libcurl-4.dll libcurl.dll
+			DOC "Path to the cURL DLL (for installation)")
+		mark_as_advanced(CURL_DLL)
+	endif()
 endif()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CURL DEFAULT_MSG ${CURL_REQUIRED_VARS})
-
+find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR)
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index 37349b892..6f361e829 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -43,6 +43,7 @@ else()
 		/usr/local/include/irrlicht
 		/usr/include/irrlicht
 		/system/develop/headers/irrlicht #Haiku
+		PATH_SUFFIXES "include/irrlicht"
 	)
 
 	find_library(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht
@@ -56,16 +57,19 @@ endif()
 
 # On Windows, find the DLL for installation
 if(WIN32)
-	if(MSVC)
-		set(IRRLICHT_COMPILER "VisualStudio")
-	else()
-		set(IRRLICHT_COMPILER "gcc")
+	# If VCPKG_APPLOCAL_DEPS is ON, dll's are automatically handled by VCPKG
+	if(NOT VCPKG_APPLOCAL_DEPS)
+		if(MSVC)
+			set(IRRLICHT_COMPILER "VisualStudio")
+		else()
+			set(IRRLICHT_COMPILER "gcc")
+		endif()
+		find_file(IRRLICHT_DLL NAMES Irrlicht.dll
+			PATHS
+			"${IRRLICHT_SOURCE_DIR}/bin/Win32-${IRRLICHT_COMPILER}"
+			DOC "Path of the Irrlicht dll (for installation)"
+		)
 	endif()
-	find_file(IRRLICHT_DLL NAMES Irrlicht.dll
-		PATHS
-		"${IRRLICHT_SOURCE_DIR}/bin/Win32-${IRRLICHT_COMPILER}"
-		DOC "Path of the Irrlicht dll (for installation)"
-	)
 endif(WIN32)
 
 include(FindPackageHandleStandardArgs)
diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake
index cd6e7bdd8..4bc88b6b1 100644
--- a/cmake/Modules/FindLuaJIT.cmake
+++ b/cmake/Modules/FindLuaJIT.cmake
@@ -9,7 +9,7 @@
 FIND_PATH(LUA_INCLUDE_DIR luajit.h
 	HINTS
 	$ENV{LUA_DIR}
-	PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include
+	PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include luajit
 	PATHS
 	~/Library/Frameworks
 	/Library/Frameworks
@@ -19,19 +19,31 @@ FIND_PATH(LUA_INCLUDE_DIR luajit.h
 	/opt
 )
 
-FIND_LIBRARY(LUA_LIBRARY
-	NAMES luajit-5.1
-	HINTS
-	$ENV{LUA_DIR}
-	PATH_SUFFIXES lib64 lib
-	PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/sw
-	/opt/local
-	/opt/csw
-	/opt
-)
+# Test if running on vcpkg toolchain
+if(DEFINED VCPKG_TARGET_TRIPLET AND DEFINED VCPKG_APPLOCAL_DEPS)
+	# On vcpkg luajit is 'lua51' and normal lua is 'lua'
+	FIND_LIBRARY(LUA_LIBRARY
+		NAMES lua51
+		HINTS
+		$ENV{LUA_DIR}
+		PATH_SUFFIXES lib
+	)
+else()
+	FIND_LIBRARY(LUA_LIBRARY
+		NAMES luajit-5.1
+		HINTS
+		$ENV{LUA_DIR}
+		PATH_SUFFIXES lib64 lib
+		PATHS
+		~/Library/Frameworks
+		/Library/Frameworks
+		/sw
+		/opt/local
+		/opt/csw
+		/opt
+	)
+endif()
+
 
 IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h")
 	FILE(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT .+\"")
diff --git a/cmake/Modules/FindOpenGLES2.cmake b/cmake/Modules/FindOpenGLES2.cmake
index a8622f3b2..a47126705 100644
--- a/cmake/Modules/FindOpenGLES2.cmake
+++ b/cmake/Modules/FindOpenGLES2.cmake
@@ -1,6 +1,4 @@
 #-------------------------------------------------------------------
-# This file is stolen from part of the CMake build system for OGRE (Object-oriented Graphics Rendering Engine) http://www.ogre3d.org/
-#
 # The contents of this file are placed in the public domain. Feel
 # free to make use of it in any way you like.
 #-------------------------------------------------------------------
@@ -16,26 +14,18 @@
 #  EGL_INCLUDE_DIR  - the EGL include directory
 #  EGL_LIBRARIES    - Link these to use EGL
 
-# Win32, Apple, and Android are not tested!
+# Win32 and Apple are not tested!
 # Linux tested and works
 
 if(WIN32)
-	if(CYGWIN)
-		find_path(OPENGLES2_INCLUDE_DIR GLES2/gl2.h)
-		find_library(OPENGLES2_LIBRARY libGLESv2)
-	else()
-		if(BORLAND)
-			set(OPENGLES2_LIBRARY import32 CACHE STRING "OpenGL ES 2.x library for Win32")
-		else()
-			# TODO
-			# set(OPENGLES_LIBRARY ${SOURCE_DIR}/Dependencies/lib/release/libGLESv2.lib CACHE STRING "OpenGL ES 2.x library for win32"
-		endif()
-	endif()
+	find_path(OPENGLES2_INCLUDE_DIR GLES2/gl2.h)
+	find_library(OPENGLES2_LIBRARY libGLESv2)
 elseif(APPLE)
 	create_search_paths(/Developer/Platforms)
 	findpkg_framework(OpenGLES2)
 	set(OPENGLES2_LIBRARY "-framework OpenGLES")
 else()
+	# Unix
 	find_path(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
 		PATHS /usr/openwin/share/include
 			/opt/graphics/OpenGL/include
@@ -47,55 +37,34 @@ else()
 		NAMES GLESv2
 		PATHS /opt/graphics/OpenGL/lib
 			/usr/openwin/lib
-			/usr/shlib /usr/X11R6/lib
+			/usr/X11R6/lib
 			/usr/lib
 	)
 
-	if(NOT BUILD_ANDROID)
-		find_path(EGL_INCLUDE_DIR EGL/egl.h
-			PATHS /usr/openwin/share/include
-				/opt/graphics/OpenGL/include
-				/usr/X11R6/include
-				/usr/include
-		)
+	include(FindPackageHandleStandardArgs)
+	find_package_handle_standard_args(OPENGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
 
-		find_library(EGL_LIBRARY
-			NAMES EGL
-			PATHS /opt/graphics/OpenGL/lib
-				/usr/openwin/lib
-				/usr/shlib
-				/usr/X11R6/lib
-				/usr/lib
-		)
+	find_path(EGL_INCLUDE_DIR EGL/egl.h
+		PATHS /usr/openwin/share/include
+			/opt/graphics/OpenGL/include
+			/usr/X11R6/include
+			/usr/include
+	)
 
-		# On Unix OpenGL usually requires X11.
-		# It doesn't require X11 on OSX.
+	find_library(EGL_LIBRARY
+		NAMES EGL
+		PATHS /opt/graphics/OpenGL/lib
+			/usr/openwin/lib
+			/usr/X11R6/lib
+			/usr/lib
+	)
 
-		if(OPENGLES2_LIBRARY)
-			if(NOT X11_FOUND)
-				include(FindX11)
-			endif()
-			if(X11_FOUND)
-				set(OPENGLES2_LIBRARIES ${X11_LIBRARIES})
-			endif()
-		endif()
-	endif()
+	include(FindPackageHandleStandardArgs)
+	find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
 endif()
 
-set(OPENGLES2_LIBRARIES ${OPENGLES2_LIBRARIES} ${OPENGLES2_LIBRARY})
-
-if(BUILD_ANDROID)
-	if(OPENGLES2_LIBRARY)
-		set(EGL_LIBRARIES)
-		set(OPENGLES2_FOUND TRUE)
-	endif()
-else()
-	if(OPENGLES2_LIBRARY AND EGL_LIBRARY)
-		set(OPENGLES2_LIBRARIES ${OPENGLES2_LIBRARY} ${OPENGLES2_LIBRARIES})
-		set(EGL_LIBRARIES ${EGL_LIBRARY} ${EGL_LIBRARIES})
-		set(OPENGLES2_FOUND TRUE)
-	endif()
-endif()
+set(OPENGLES2_LIBRARIES ${OPENGLES2_LIBRARY})
+set(EGL_LIBRARIES ${EGL_LIBRARY})
 
 mark_as_advanced(
 	OPENGLES2_INCLUDE_DIR
@@ -103,10 +72,3 @@ mark_as_advanced(
 	EGL_INCLUDE_DIR
 	EGL_LIBRARY
 )
-
-if(OPENGLES2_FOUND)
-	message(STATUS "Found system OpenGL ES 2 library: ${OPENGLES2_LIBRARIES}")
-else()
-	set(OPENGLES2_LIBRARIES "")
-endif()
-