Merge pull request #133 from arrayfire/revert-132-cmake

Revert "Use glfw find_package"

Author: 9prady9

CMakeModules/FindGLFW.cmake

@@ -0,0 +1,63 @@
+# Sourced from
+#https://code.google.com/p/assembly3d/
+
+# Locate the glfw library
+# This module defines the following variables:
+# GLFW_LIBRARY, the name of the library;
+# GLFW_INCLUDE_DIR, where to find glfw include files.
+# GLFW_FOUND, true if both the GLFW_LIBRARY and GLFW_INCLUDE_DIR have been found.
+#
+# To help locate the library and include file, you could define an environment variable called
+# GLFW_ROOT which points to the root of the glfw library installation. This is pretty useful
+# on a Windows platform.
+#
+#
+# Usage example to compile an "executable" target to the glfw library:
+#
+# FIND_PACKAGE (glfw REQUIRED)
+# INCLUDE_DIRECTORIES (${GLFW_INCLUDE_DIR})
+# ADD_EXECUTABLE (executable ${EXECUTABLE_SRCS})
+# TARGET_LINK_LIBRARIES (executable ${GLFW_LIBRARY})
+#
+# TODO:
+# Allow the user to select to link to a shared library or to a static library.
+
+#Search for the include file...
+FIND_PATH(GLFW_INCLUDE_DIR GLFW/glfw3.h DOC "Path to GLFW include directory."
+  HINTS
+  $ENV{GLFW_ROOT}
+  PATH_SUFFIX include #For finding the include file under the root of the glfw expanded archive, typically on Windows.
+  PATHS
+  /usr/include/
+  /usr/local/include/
+  # By default headers are under GLFW subfolder
+  /usr/include/GLFW
+  /usr/local/include/GLFW
+  ${GLFW_ROOT_DIR}/include/ # added by ptr
+)
+
+FIND_LIBRARY(GLFW_LIBRARY DOC "Absolute path to GLFW library."
+  NAMES glfw GLFW.lib glfw3
+  HINTS
+  $ENV{GLFW_ROOT}
+  PATH_SUFFIXES lib/x64 release debug #For finding the library file under the root of the glfw expanded archive, typically on Windows.
+  PATHS
+  /usr/lib
+  /usr/lib64
+  /usr/lib/x86_64-linux-gnu
+  /usr/lib/arm-linux-gnueabihf
+  /usr/local/lib
+  /usr/local/lib64
+  /sw/lib
+  /opt/local/lib
+  ${GLFW_ROOT_DIR}/lib-msvc100 # added by ptr
+  ${GLFW_ROOT_DIR}/lib-msvc110
+  ${GLFW_ROOT_DIR}/lib-msvc120
+  ${GLFW_ROOT_DIR}/lib
+)
+
+SET(GLFW_FOUND 0)
+IF(GLFW_LIBRARY AND GLFW_INCLUDE_DIR)
+  SET(GLFW_FOUND 1)
+  message(STATUS "GLFW found!")
+ENDIF(GLFW_LIBRARY AND GLFW_INCLUDE_DIR)

src/backend/opengl/CMakeLists.txt

@@ -40,14 +40,14 @@ IF(UNIX)
 ENDIF(UNIX)
 
 IF(${USE_WINDOW_TOOLKIT} STREQUAL "glfw3")
-    find_package(glfw3)
-    IF(glfw3_FOUND)
-        SET(WTK_INCLUDE_DIRS)
-        SET(WTK_LIBRARIES glfw)
+    FIND_PACKAGE(GLFW REQUIRED)
+    IF(GLFW_FOUND)
+        SET(WTK_INCLUDE_DIRS ${GLFW_INCLUDE_DIR})
+        SET(WTK_LIBRARIES ${GLFW_LIBRARY})
         ADD_DEFINITIONS(-DUSE_GLFW)
-    ELSE(glfw3_FOUND)
+    ELSE(GLFW_FOUND)
         MESSAGE(FATAL_ERROR "GLFW not found")
-    ENDIF(glfw3_FOUND)
+    ENDIF(GLFW_FOUND)
 ENDIF()
 
 IF(${USE_WINDOW_TOOLKIT} STREQUAL "sdl2")