Skip to content

Use GNUInstallDirs for install paths #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use GNUInstallDirs for install paths #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions IGC/AdaptorOCL/OCL/LoadBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ 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;

symbol = dlsym(module, name);
if (!symbol)
{
printf("failed trying to load symbol %s \n", name);
return NULL;
}

Expand Down
8 changes: 4 additions & 4 deletions IGC/BiFModule/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,10 @@ endif()
)

add_custom_command(
OUTPUT "${IGC_TARGET__TOOLS_CLANG_DIR}/${COMMON_CLANG_LIB_FULL_NAME}"
COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${COMMON_CLANG_LIBRARY_NAME}>" "${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 "$<TARGET_FILE:${COMMON_CLANG_LIBRARY_NAME}>" "${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(
Expand Down
23 changes: 15 additions & 8 deletions IGC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}"
)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions visa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion visa/iga/IGALibrary/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down