[arrayfire] 52/79: Remove references to installer_mode

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository arrayfire.

commit 12bfe669db1422ae10c4b699989feef4fc5defd7
Author: Umar Arshad <umar at arrayfire.com>
Date:   Wed Jun 10 13:26:45 2015 -0400

    Remove references to installer_mode
---
 CMakeLists.txt                    |  3 ---
 src/backend/cpu/CMakeLists.txt    |  5 -----
 src/backend/cuda/CMakeLists.txt   |  5 -----
 src/backend/opencl/CMakeLists.txt | 23 +++++++++--------------
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f18b7a..f512fb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ OPTION(BUILD_GRAPHICS "Build ArrayFire with Forge Graphics" ON)
 OPTION(BUILD_DOCS "Create ArrayFire Documentation" OFF)
 OPTION(WITH_COVERAGE "Added code coverage flags" OFF)
 
-OPTION(INSTALLER_MODE "Build arrayfire in installer mode" OFF)
-MARK_AS_ADVANCED(INSTALLER_MODE)
-
 # Set a default build type if none was specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt
index 7191576..056cba9 100644
--- a/src/backend/cpu/CMakeLists.txt
+++ b/src/backend/cpu/CMakeLists.txt
@@ -130,11 +130,6 @@ SET_TARGET_PROPERTIES(afcpu PROPERTIES
                       VERSION "${AF_VERSION}"
                       SOVERSION "${AF_VERSION_MAJOR}")
 
-IF(INSTALLER_MODE)
-    SET_TARGET_PROPERTIES(afcpu PROPERTIES LINK_INTERFACE_LIBRARIES "")
-    SET_TARGET_PROPERTIES(afcpu PROPERTIES INTERFACE_LINK_LIBRARIES "")
-ENDIF()
-
 INSTALL(TARGETS afcpu EXPORT CPU DESTINATION "${AF_INSTALL_LIB_DIR}"
         COMPONENT libraries)
 
diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
index 912cc08..e13512b 100644
--- a/src/backend/cuda/CMakeLists.txt
+++ b/src/backend/cuda/CMakeLists.txt
@@ -281,11 +281,6 @@ SET_TARGET_PROPERTIES(afcuda PROPERTIES
     VERSION "${AF_VERSION}"
     SOVERSION "${AF_VERSION_MAJOR}")
 
-IF(INSTALLER_MODE)
-    SET_TARGET_PROPERTIES(afcuda PROPERTIES LINK_INTERFACE_LIBRARIES "")
-    SET_TARGET_PROPERTIES(afcuda PROPERTIES INTERFACE_LINK_LIBRARIES "")
-ENDIF()
-
 INSTALL(TARGETS afcuda EXPORT CUDA DESTINATION "${AF_INSTALL_LIB_DIR}"
         COMPONENT libraries)
 
diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
index c832533..7e3c485 100644
--- a/src/backend/opencl/CMakeLists.txt
+++ b/src/backend/opencl/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 PROJECT(ARRAYFIRE)
 
 FIND_PACKAGE(OpenCL REQUIRED)
@@ -210,25 +210,20 @@ IF(FORGE_FOUND)
     TARGET_LINK_LIBRARIES(afopencl  PRIVATE ${FORGE_LIBRARIES})
 ENDIF()
 
-IF(INSTALLER_MODE)
-    SET_TARGET_PROPERTIES(afopencl PROPERTIES LINK_INTERFACE_LIBRARIES "")
-    SET_TARGET_PROPERTIES(afopencl PROPERTIES INTERFACE_LINK_LIBRARIES "")
-ELSE()
 # locally built but not installed libraries (clBLAS and clFFT) must NOT appear in the
 # link interface. The best option would be to use LINK_PRIVATE, but unfortunately
 # it is not available for older cmake than 2.8.7, so they must be remove from
 # the link interface manually. Both LINK_INTERFACE_LIBRARIES and INTERFACE_LINK_LIBRARIES
 # are used to keep it working with older cmake versions that 2.8.12 and avoid
 # warnings on newer versions - see CMP0022
-    FOREACH(property LINK_INTERFACE_LIBRARIES INTERFACE_LINK_LIBRARIES)
-        GET_TARGET_PROPERTY(value afopencl ${property})
-        IF(value)
-            LIST(REMOVE_ITEM value ${CLBLAS_LIBRARIES} ${CLFFT_LIBRARIES})
-            SET_TARGET_PROPERTIES(afopencl PROPERTIES LINK_INTERFACE_LIBRARIES "${value}")
-            SET_TARGET_PROPERTIES(afopencl PROPERTIES INTERFACE_LINK_LIBRARIES "${value}")
-        ENDIF()
-    ENDFOREACH()
-ENDIF()
+FOREACH(property LINK_INTERFACE_LIBRARIES INTERFACE_LINK_LIBRARIES)
+    GET_TARGET_PROPERTY(value afopencl ${property})
+    IF(value)
+        LIST(REMOVE_ITEM value ${CLBLAS_LIBRARIES} ${CLFFT_LIBRARIES})
+        SET_TARGET_PROPERTIES(afopencl PROPERTIES LINK_INTERFACE_LIBRARIES "${value}")
+        SET_TARGET_PROPERTIES(afopencl PROPERTIES INTERFACE_LINK_LIBRARIES "${value}")
+    ENDIF()
+ENDFOREACH()
 
 INSTALL(TARGETS afopencl EXPORT OpenCL DESTINATION "${AF_INSTALL_LIB_DIR}"
         COMPONENT libraries)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git