Remove freeimage dependency from examples

arrayfire · Feb 26, 2017 · 44e17f2 · 44e17f2
1 parent beda825
commit 44e17f2
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -38,16 +38,11 @@ IF(TARGET forge)
 ELSE(TARGET forge)
 
     SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-    FIND_PACKAGE(FreeImage REQUIRED)
-    FIND_PACKAGE(OpenGL REQUIRED)
     FIND_PACKAGE(Forge REQUIRED)
 
     SET(X11_LIBS "")
 
-    INCLUDE_DIRECTORIES(
-        ${FORGE_INCLUDE_DIRS}
-        ${FREEIMAGE_INCLUDE_PATH}
-        )
+    INCLUDE_DIRECTORIES(${FORGE_INCLUDE_DIRS})
 
     # OS Definitions
     IF(UNIX)
@@ -96,11 +91,9 @@ FOREACH(FILE ${CPU_EXAMPLE_SRC_FILES})
     GET_FILENAME_COMPONENT(DIR_NAME ${FULL_DIR_NAME} NAME)
 
     IF(TARGET forge)
-        BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} forge
-            "${FREEIMAGE_LIBRARY};${OPENGL_gl_LIBRARY}")
+        BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} forge "")
     ELSE(TARGET forge)
-        BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} ${FORGE_LIBRARIES}
-            "${FREEIMAGE_LIBRARY};${OPENGL_gl_LIBRARY};${X11_LIBS};")
+        BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} ${FORGE_LIBRARIES} "${X11_LIBS}")
     ENDIF()
 ENDFOREACH()
 
@@ -132,11 +125,10 @@ IF (BUILD_EXAMPLES_CUDA)
             GET_FILENAME_COMPONENT(DIR_NAME ${FULL_DIR_NAME} NAME)
 
             IF(TARGET forge)
-                BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} forge
-                    "${FREEIMAGE_LIBRARY};${CUDA_LIBRARIES}")
+                BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} forge "${CUDA_LIBRARIES}")
             ELSE(TARGET forge)
                 BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} ${FORGE_LIBRARIES}
-                    "${FREEIMAGE_LIBRARY};${OPENGL_gl_LIBRARY};${X11_LIBS};${CUDA_LIBRARIES}")
+                    "${X11_LIBS};${CUDA_LIBRARIES}")
             ENDIF()
         ENDFOREACH()
     ELSE()
@@ -160,11 +152,10 @@ IF (BUILD_EXAMPLES_OPENCL)
             GET_FILENAME_COMPONENT(DIR_NAME ${FULL_DIR_NAME} NAME)
 
             IF(TARGET forge)
-                BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} forge
-                    "${FREEIMAGE_LIBRARY};${OPENGL_gl_LIBRARY};${OpenCL_LIBRARIES}")
+                BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} forge "${OpenCL_LIBRARIES}")
             ELSE(TARGET forge)
                 BUILD_EXAMPLE(${EXAMPLE} ${FILE} ${DIR_NAME} ${FORGE_LIBRARIES}
-                    "${FREEIMAGE_LIBRARY};${OPENGL_gl_LIBRARY};${X11_LIBS};${OpenCL_LIBRARIES}")
+                    "${X11_LIBS};${OpenCL_LIBRARIES}")
             ENDIF()
         ENDFOREACH()
     ELSE()