From 8ba9c6849d78946d73ee50ab2d1983315e8c5a4f Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Fri, 8 Mar 2019 09:06:29 -0800 Subject: [PATCH] Use GNUInstallDirs for install paths --- IGC/AdaptorOCL/OCL/LoadBuffer.cpp | 2 ++ IGC/BiFModule/CMakeLists.txt | 8 ++++---- IGC/CMakeLists.txt | 23 +++++++++++++++-------- visa/CMakeLists.txt | 2 ++ visa/iga/IGALibrary/CMakeLists.txt | 3 ++- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/IGC/AdaptorOCL/OCL/LoadBuffer.cpp b/IGC/AdaptorOCL/OCL/LoadBuffer.cpp index b3f1bdc8d49b..4405fe5ca83b 100644 --- a/IGC/AdaptorOCL/OCL/LoadBuffer.cpp +++ b/IGC/AdaptorOCL/OCL/LoadBuffer.cpp @@ -56,6 +56,7 @@ MemoryBuffer *llvm::LoadBufferFromResource(const char *pResName, symbol = dlsym(module, size_name); if (!symbol) { + printf("failed trying to load symbol %s \n", size_name); return NULL; } size = *(uint32_t *)symbol; @@ -63,6 +64,7 @@ MemoryBuffer *llvm::LoadBufferFromResource(const char *pResName, symbol = dlsym(module, name); if (!symbol) { + printf("failed trying to load symbol %s \n", name); return NULL; } diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt index b4f709acee8e..bcd940ecde9b 100644 --- a/IGC/BiFModule/CMakeLists.txt +++ b/IGC/BiFModule/CMakeLists.txt @@ -204,10 +204,10 @@ endif() ) add_custom_command( - OUTPUT "${IGC_TARGET__TOOLS_CLANG_DIR}/${COMMON_CLANG_LIB_FULL_NAME}" - COMMAND ${CMAKE_COMMAND} -E copy "$" "${IGC_TARGET__TOOLS_CLANG_DIR}/${COMMON_CLANG_LIB_FULL_NAME}" - DEPENDS ${COMMON_CLANG_LIBRARY_NAME} - ) + OUTPUT "${IGC_TARGET__TOOLS_CLANG_DIR}/${COMMON_CLANG_LIB_FULL_NAME}" + COMMAND ${CMAKE_COMMAND} -E copy "$" "${IGC_TARGET__TOOLS_CLANG_DIR}/${COMMON_CLANG_LIB_FULL_NAME}" + DEPENDS ${COMMON_CLANG_LIBRARY_NAME} + ) set(cclang_header_filename "opencl-c.h") add_custom_command( diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt index fd6721db5fd5..ee66f61d70aa 100644 --- a/IGC/CMakeLists.txt +++ b/IGC/CMakeLists.txt @@ -1875,6 +1875,10 @@ if(NOT DEFINED PATCH_VERSION) set(PATCH_VERSION 0) endif() +if(NOT DEFINED PROJECT_VERSION) + set(PROJECT_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}) +endif() + # IGC project available configuration types: # One standard configuration + "ReleaseInternal" custom configurations. set(IGC_CMAKE_CONFIGURATION_TYPES @@ -3521,7 +3525,8 @@ add_library("${IGC_BUILD__PROJ__igc_dll}" SHARED ${IGC_BUILD__HDR__IGC__igc_dll} ${IGC_BUILD__RES__IGC__igc_dll} ) - +set_target_properties("${IGC_BUILD__PROJ__igc_dll}" PROPERTIES SOVERSION ${PROJECT_VERSION}) + #FCL add_library("${IGC_BUILD__PROJ__fcl_dll}" SHARED ${IGC_BUILD__SRC__IGC__fcl_dll} @@ -3801,6 +3806,7 @@ if(_targetIsStatic) ) # Link line for shared / dynamic library requires only library project (all static libs are linked inside). set_property(TARGET "${IGC_BUILD__PROJ__fcl_dll}" PROPERTY LINK_INTERFACE_LIBRARIES "") + set_target_properties("${IGC_BUILD__PROJ__fcl_dll}" PROPERTIES SOVERSION ${PROJECT_VERSION}) set("IGC_BUILD__LINK_LINE__fcl_dll" "${IGC_BUILD__PROJ__fcl_dll}" ) @@ -3876,13 +3882,14 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/igc.opencl.h.in ${IGC_BUIL configure_file(${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/igc-opencl.pc.in ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/igc-opencl.pc @ONLY) if(UNIX) - install(TARGETS ${IGC_BUILD__PROJ__igc_dll} DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/lib COMPONENT igc-core) - install(TARGETS ${IGC_BUILD__PROJ__fcl_dll} DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/lib COMPONENT igc-opencl) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/ocl_igc_shared DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/include/igc COMPONENT igc-opencl-devel) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/ocl_igc_interface DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/include/igc COMPONENT igc-opencl-devel) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/cif DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/include/igc COMPONENT igc-opencl-devel) - install(FILES ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/igc-opencl.pc DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/lib/pkgconfig COMPONENT igc-opencl-devel) - install(FILES ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/igc.opencl.h DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/include/igc COMPONENT igc-opencl-devel) + include(GNUInstallDirs) + install(TARGETS ${IGC_BUILD__PROJ__igc_dll} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT igc-core) + install(TARGETS ${IGC_BUILD__PROJ__fcl_dll} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT igc-opencl) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/ocl_igc_shared DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igc COMPONENT igc-opencl-devel) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/ocl_igc_interface DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igc COMPONENT igc-opencl-devel) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/cif DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igc COMPONENT igc-opencl-devel) + install(FILES ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/igc-opencl.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT igc-opencl-devel) + install(FILES ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/igc.opencl.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/igc COMPONENT igc-opencl-devel) elseif (WIN32) install(TARGETS ${IGC_BUILD__PROJ__igc_dll} RUNTIME DESTINATION Release/lh64 CONFIGURATIONS Release) diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt index c230f8d36dee..e4307c4fc803 100644 --- a/visa/CMakeLists.txt +++ b/visa/CMakeLists.txt @@ -341,6 +341,8 @@ if (UNIX OR WIN32) source_group("Header Files" FILES ${GenX_IR_EXE_HEADERS} ) source_group("Lex Yacc Files" FILES ${GenX_IR_EXE_lex_yacc} ) target_link_libraries(GenX_IR_Exe LocalScheduler IGA_SLIB IGA_ENC_LIB) + set_target_properties(GenX_IR_Exe PROPERTIES SOVERSION ${PROJECT_VERSION}) + if (ANDROID AND MEDIA_IGA) target_link_libraries(GenX_IR_Exe c++_static) endif(ANDROID AND MEDIA_IGA) diff --git a/visa/iga/IGALibrary/CMakeLists.txt b/visa/iga/IGALibrary/CMakeLists.txt index f4e9d34da6ab..6e315f3b26d2 100644 --- a/visa/iga/IGALibrary/CMakeLists.txt +++ b/visa/iga/IGALibrary/CMakeLists.txt @@ -330,9 +330,10 @@ endif(ANDROID AND MEDIA_IGA) # target_link_libraries(IGA PRIVATE GEDLibrary) if(UNIX) + set_target_properties(IGA_DLL PROPERTIES SOVERSION ${PROJECT_VERSION}) INSTALL(TARGETS IGA_DLL RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/. COMPONENT igc-core - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT igc-core + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT igc-core ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/. COMPONENT igc-core ) elseif(WIN32)