Modified lib destinations for installers:

mlloreda · pradeep · commit eb35ecbf2798 · 2018-07-11T22:42:05.000+05:30
- Now installing AF libs to `lib64` instead of `lib`.
- Installing dependencies to the same location as AF libs -
  $AF_INSTALL_LIB_DIR (lib64).
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -231,7 +231,7 @@ if(Forge_FOUND AND NOT AF_USE_SYSTEM_FORGE)
       set(fg_dlib_px "lib")
     endif ()
     install(DIRECTORY "${PROJECT_BINARY_DIR}/third_party/forge/${fg_dlib_px}/"
-      DESTINATION "${AF_INSTALL_BIN_DIR}"
+      DESTINATION "${AF_INSTALL_LIB_DIR}"
       COMPONENT common_backend_dependencies)
 endif()
 
@@ -293,14 +293,14 @@ if((USE_CPU_MKL OR USE_OPENCL_MKL) AND TARGET MKL::MKL AND AF_INSTALL_STANDALONE
   if(TARGET MKL::ThreadingLibrary)
     install(FILES
       $<TARGET_FILE:MKL::ThreadingLibrary>
-      DESTINATION ${AF_INSTALL_BIN_DIR}
+      DESTINATION ${AF_INSTALL_LIB_DIR}
       COMPONENT mkl_dependencies)
   endif()
 
   if(NOT WIN32)
     install(FILES
       $<TARGET_FILE:MKL::Interface>
-      DESTINATION ${AF_INSTALL_BIN_DIR}
+      DESTINATION ${AF_INSTALL_LIB_DIR}
       COMPONENT mkl_dependencies)
   endif()
 
@@ -313,7 +313,7 @@ if((USE_CPU_MKL OR USE_OPENCL_MKL) AND TARGET MKL::MKL AND AF_INSTALL_STANDALONE
     # is a linker script and not a symlink so it cant be resolved using
     # get_filename_component
     ${AF_ADDITIONAL_MKL_LIBRARIES}
-    DESTINATION ${AF_INSTALL_BIN_DIR}
+    DESTINATION ${AF_INSTALL_LIB_DIR}
     COMPONENT mkl_dependencies)
 endif()
 
diff --git a/CMakeModules/AFInstallDirs.cmake b/CMakeModules/AFInstallDirs.cmake
@@ -2,6 +2,8 @@
 # Sets ArrayFire installation paths.
 #
 
+include(GNUInstallDirs)
+
 # NOTE: These paths are all relative to the project installation prefix.
 
 # Executables
@@ -11,7 +13,11 @@ endif()
 
 # Libraries
 if(NOT DEFINED AF_INSTALL_LIB_DIR)
-  set(AF_INSTALL_LIB_DIR "lib" CACHE PATH "Installation path for libraries")
+  if(WIN32)
+    set(AF_INSTALL_LIB_DIR "lib" CACHE PATH "Installation path for libraries")
+  else()
+    set(AF_INSTALL_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
+  endif()
 endif()
 
 # Header files
diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt
@@ -103,7 +103,7 @@ if(AF_WITH_GRAPHICS)
         $<TARGET_FILE:glbinding::glbinding>
         $<$<PLATFORM_ID:Linux>:$<TARGET_SONAME_FILE:glbinding::glbinding>>
         $<$<PLATFORM_ID:Darwin>:$<TARGET_SONAME_FILE:glbinding::glbinding>>
-      DESTINATION ${AF_INSTALL_BIN_DIR}
+      DESTINATION ${AF_INSTALL_LIB_DIR}
       COMPONENT common_backend_dependencies)
   endif()
 
diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
@@ -538,7 +538,7 @@ macro(afcu_collect_libs libname)
   else () #UNIX
     get_filename_component(outpath "${dlib_path_prefix}/${PX}${libname}${SX}" REALPATH)
     install(FILES       ${outpath}
-            DESTINATION ${AF_INSTALL_BIN_DIR}
+            DESTINATION ${AF_INSTALL_LIB_DIR}
             RENAME      "${PX}${libname}${SX}.${CUDA_VERSION}"
             COMPONENT   cuda_dependencies)
   endif ()
@@ -562,7 +562,7 @@ if(AF_INSTALL_STANDALONE)
   elseif(UNIX)
     get_filename_component(nvrtc_outpath "${dlib_path_prefix}/${PX}nvrtc-builtins${SX}" REALPATH)
     install(FILES       ${nvrtc_outpath}
-            DESTINATION ${AF_INSTALL_BIN_DIR}
+            DESTINATION ${AF_INSTALL_LIB_DIR}
             RENAME      "${PX}nvrtc-builtins${SX}"
             COMPONENT   cuda_dependencies)
   else()
diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
@@ -540,7 +540,7 @@ if(NOT APPLE AND AF_INSTALL_STANDALONE)
   if(UNIX)
     get_filename_component(opencl_outpath "${OpenCL_LIBRARIES}" REALPATH)
     install(FILES ${opencl_outpath}
-        DESTINATION ${AF_INSTALL_BIN_DIR}
+        DESTINATION ${AF_INSTALL_LIB_DIR}
         RENAME "${CMAKE_SHARED_LIBRARY_PREFIX}OpenCL${CMAKE_SHARED_LIBRARY_SUFFIX}.1"
         COMPONENT opencl_dependencies)
   else()
