| 12345678910111213141516171819202122232425262728293031323334353637383940 |
- --- 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)
|
