diff options
| author | Zhigang Gong <zhigang.gong@intel.com> | 2015-03-17 07:30:50 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2015-03-19 10:36:56 +0800 |
| commit | 268b2174e4ebf22b240064211c0a1c99c3d59642 (patch) | |
| tree | c2115fe55fae7a11ec0c634f1f52dfe3537455a7 /CMakeLists.txt | |
| parent | acfc2a2799b9cb4153b7581f66a78b046fbb97ec (diff) | |
| download | beignet-268b2174e4ebf22b240064211c0a1c99c3d59642.tar.gz | |
Build: fix the beignet icd name when CMAKE_INSTALL_FULL_LIBDIR is undefined.
On some distributions, the CMAKE_INSTALL_FULL_LIBDIR or CMAKE_LIBRARY_ARCHITECTURE
may be undefined. To avoid generate intel-beignet-.icd file name, we need to get
rid of the extra "-" for such case.
Reported by Igor Gnatenko.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e11a3d0f..28cb28ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,9 @@ INCLUDE (GNUInstallDirs OPTIONAL) # support old CMake without GNUInstallDirs if (NOT CMAKE_INSTALL_FULL_LIBDIR) set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") - set (CMAKE_LIBRARY_ARCHITECTURE "") + set (BEIGNET_LIBRARY_ARCHITECTURE "") +else (NOT CMAKE_INSTALL_FULL_LIBDIR) + set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}") endif (NOT CMAKE_INSTALL_FULL_LIBDIR) if (NOT LIB_INSTALL_DIR) @@ -57,7 +59,11 @@ endif (NOT BEIGNET_INSTALL_DIR) 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/") - set (ICD_FILE_NAME "intel-beignet-${CMAKE_LIBRARY_ARCHITECTURE}.icd") + 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/") # Force Release with debug info |