Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 545924 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-19 / +4 lines)
Lines 39-52 Link Here
39
39
40
SET(CMAKE_VERBOSE_MAKEFILE "false")
40
SET(CMAKE_VERBOSE_MAKEFILE "false")
41
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
41
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
42
INCLUDE (GNUInstallDirs OPTIONAL)
42
43
# support old CMake without GNUInstallDirs
43
set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
44
if (NOT CMAKE_INSTALL_FULL_LIBDIR)
44
set (BEIGNET_LIBRARY_ARCHITECTURE "")
45
  set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
46
  set (BEIGNET_LIBRARY_ARCHITECTURE "")
47
else (NOT CMAKE_INSTALL_FULL_LIBDIR)
48
  set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
49
endif (NOT CMAKE_INSTALL_FULL_LIBDIR)
50
45
51
if (NOT LIB_INSTALL_DIR)
46
if (NOT LIB_INSTALL_DIR)
52
  set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
47
  set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
Lines 55-71 Link Here
55
  set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/")
50
  set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/")
56
endif (NOT BEIGNET_INSTALL_DIR)
51
endif (NOT BEIGNET_INSTALL_DIR)
57
52
58
# allow co-installation of 32- and 64-bit versions:
53
set (ICD_FILE_NAME "intel-beignet.icd")
59
# https://wiki.debian.org/Multiarch
60
if (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/")
61
  set (ICD_FILE_NAME "intel-beignet.icd")
62
else (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/")
63
  if (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "")
64
    set (ICD_FILE_NAME "intel-beignet.icd")
65
  else (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "")
66
    set (ICD_FILE_NAME "intel-beignet-${BEIGNET_LIBRARY_ARCHITECTURE}.icd")
67
  endif (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "")
68
endif (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/")
69
54
70
# Force Release with debug info
55
# Force Release with debug info
71
if (NOT CMAKE_BUILD_TYPE)
56
if (NOT CMAKE_BUILD_TYPE)

Return to bug 545924