blob: c9aef4d9dafc5907aa837139f58210ac0d4dd6a6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- a/CMakeLists.txt 2015-04-17 04:27:51.000000000 +0200
+++ b/CMakeLists.txt 2015-05-20 20:59:17.895041760 +0200
@@ -39,14 +39,9 @@
SET(CMAKE_VERBOSE_MAKEFILE "false")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
-INCLUDE (GNUInstallDirs OPTIONAL)
-# support old CMake without GNUInstallDirs
-if (NOT CMAKE_INSTALL_FULL_LIBDIR)
- set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
- set (BEIGNET_LIBRARY_ARCHITECTURE "")
-else (NOT CMAKE_INSTALL_FULL_LIBDIR)
- set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
-endif (NOT CMAKE_INSTALL_FULL_LIBDIR)
+
+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
+set (BEIGNET_LIBRARY_ARCHITECTURE "")
if (NOT LIB_INSTALL_DIR)
set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
@@ -55,17 +50,7 @@
set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/")
endif (NOT BEIGNET_INSTALL_DIR)
-# allow co-installation of 32- and 64-bit versions:
-# https://wiki.debian.org/Multiarch
-if (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/")
- set (ICD_FILE_NAME "intel-beignet.icd")
-else (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/")
- if (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "")
- set (ICD_FILE_NAME "intel-beignet.icd")
- else (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "")
- set (ICD_FILE_NAME "intel-beignet-${BEIGNET_LIBRARY_ARCHITECTURE}.icd")
- endif (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "")
-endif (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/")
+set (ICD_FILE_NAME "intel-beignet.icd")
# Force Release with debug info
if (NOT CMAKE_BUILD_TYPE)
|
GitWeb
