Media
/
gmmlib
mirror of https://github.com/intel/gmmlib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use GNUInstallDirs for install targets 

Commit a5f2391 hard-codes
install paths and does not honor CMAKE_INSTALL_PREFIX
setting.

GNUInstallDirs uses GNU Coding Standards and properly determines
the correct install paths based on distro.  GNUInstallDirs
also honors the CMAKE_INSTALL_PREFIX correctly.  Users can
manipulate the install prefix by defining the builtin and standard
CMAKE_INSTALL_PREFIX variable during cmake configuration (i.e.
-DCMAKE_INSTALL_PREFIX=<prefix>).

Change-Id: I2090564acfd618345ca98940548654fa86baebee
This commit is contained in:
U. Artie Eoff 2018-06-26 14:07:59 -07:00 committed by drprajap
parent a5f2391315
commit 3e2ec40f02
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/GmmLib/CMakeLists.txt
View File

@ -539,7 +539,6 @@ if(NOT DEFINED RUN_TEST_SUITE OR RUN_TEST_SUITE)
add_subdirectory(ULT) add_subdirectory(ULT)
endif() endif()
set (GMMLIB_INSTALL_TIME_ROOT_DIR "/usr")
set (IGDGMM_LIBRARY_NAME "igdgmm") set (IGDGMM_LIBRARY_NAME "igdgmm")
include(os_release_info.cmake) include(os_release_info.cmake)
@ -553,6 +552,8 @@ if("${os_name}" STREQUAL "clear-linux-os")
endif() endif()
if(UNIX) if(UNIX)
include(GNUInstallDirs)
if(NOT DEFINED MAJOR_VERSION) if(NOT DEFINED MAJOR_VERSION)
set(MAJOR_VERSION 0) set(MAJOR_VERSION 0)
endif() endif()
@ -568,28 +569,28 @@ if(UNIX)
configure_file(${BS_DIR_GMMLIB}/igdgmm.h.in ${CMAKE_BINARY_DIR}/igdgmm.h) configure_file(${BS_DIR_GMMLIB}/igdgmm.h.in ${CMAKE_BINARY_DIR}/igdgmm.h)
configure_file(${BS_DIR_GMMLIB}/igdgmm.pc.in ${CMAKE_BINARY_DIR}/igdgmm.pc @ONLY) configure_file(${BS_DIR_GMMLIB}/igdgmm.pc.in ${CMAKE_BINARY_DIR}/igdgmm.pc @ONLY)
install(TARGETS ${GMM_LIB_DLL_NAME} DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/lib COMPONENT gmmlib) install(TARGETS ${GMM_LIB_DLL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT gmmlib)
install(TARGETS gmm_umd DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/lib COMPONENT gmmlib) install(TARGETS gmm_umd DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT gmmlib)
install(DIRECTORY ${BS_DIR_GMMLIB} DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/include/igdgmm COMPONENT gmmlib-devel install(DIRECTORY ${BS_DIR_GMMLIB} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igdgmm COMPONENT gmmlib-devel
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
PATTERN "*.hpp" PATTERN "*.hpp"
PATTERN "Internal" EXCLUDE PATTERN "Internal" EXCLUDE
PATTERN "ULT" EXCLUDE) PATTERN "ULT" EXCLUDE)
install (DIRECTORY ${BS_DIR_INC} DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/include/igdgmm COMPONENT gmmlib-devel install (DIRECTORY ${BS_DIR_INC} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igdgmm COMPONENT gmmlib-devel
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
PATTERN "*.hpp") PATTERN "*.hpp")
install (DIRECTORY ${BS_DIR_UTIL} DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/include/igdgmm COMPONENT gmmlib-devel install (DIRECTORY ${BS_DIR_UTIL} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igdgmm COMPONENT gmmlib-devel
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
PATTERN "*.hpp") PATTERN "*.hpp")
install (FILES ${BS_DIR_GMMLIB}/Utility/CpuSwizzleBlt/CpuSwizzleBlt.c install (FILES ${BS_DIR_GMMLIB}/Utility/CpuSwizzleBlt/CpuSwizzleBlt.c
DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/include/igdgmm/GmmLib/Utility/CpuSwizzleBlt/ COMPONENT gmmlib-devel) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igdgmm/GmmLib/Utility/CpuSwizzleBlt/ COMPONENT gmmlib-devel)
install(FILES ${CMAKE_BINARY_DIR}/igdgmm.pc DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/lib/pkgconfig COMPONENT gmmlib-devel) install(FILES ${CMAKE_BINARY_DIR}/igdgmm.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT gmmlib-devel)
install(FILES ${CMAKE_BINARY_DIR}/igdgmm.h DESTINATION ${GMMLIB_INSTALL_TIME_ROOT_DIR}/include/igdgmm COMPONENT gmmlib-devel) install(FILES ${CMAKE_BINARY_DIR}/igdgmm.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igdgmm COMPONENT gmmlib-devel)
if(GMMLIB_CPACK_GENERATOR) if(GMMLIB_CPACK_GENERATOR)
set(CPACK_GENERATOR "${GMMLIB_CPACK_GENERATOR}") set(CPACK_GENERATOR "${GMMLIB_CPACK_GENERATOR}")
@ -657,4 +658,4 @@ if(UNIX)
include (CPack) include (CPack)
endif() endif()

8
Source/GmmLib/igdgmm.pc.in
View File

@ -1,7 +1,7 @@
prefix=@GMMLIB_INSTALL_TIME_ROOT_DIR@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix} execprefix=${prefix}
includedir=${prefix}/include/igdgmm includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/igdgmm
libdir=${exec_prefix}/lib libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: igdgmm Name: igdgmm
Description: Intel(R) Graphics Memory Management Library Description: Intel(R) Graphics Memory Management Library