maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

cmake: Install libraries to DATADIR from GNUInstallDirs 

This moves default installation location to /usr/share to match libclc.pc.
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewer: Tom Stellard

llvm-svn: 350565
This commit is contained in:
Jan Vesely 2019-01-07 20:20:37 +00:00
parent 81fe1fbf4a
commit e25db17104
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libclc/CMakeLists.txt
View File

@ -1,6 +1,7 @@
cmake_minimum_required( VERSION 3.9.2 ) cmake_minimum_required( VERSION 3.9.2 )
project( libclc VERSION 0.2.0 LANGUAGES CXX ) project( libclc VERSION 0.2.0 LANGUAGES CXX )
include( GNUInstallDirs )
# List of all targets # List of all targets
set( LIBCLC_TARGETS_ALL set( LIBCLC_TARGETS_ALL
@ -145,8 +146,8 @@ endif()
# pkg-config file # pkg-config file
configure_file( libclc.pc.in libclc.pc @ONLY ) configure_file( libclc.pc.in libclc.pc @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION share/pkgconfig ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig )
install( DIRECTORY generic/include/clc DESTINATION include ) install( DIRECTORY generic/include/clc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
if( ENABLE_RUNTIME_SUBNORMAL ) if( ENABLE_RUNTIME_SUBNORMAL )
add_library( subnormal_use_default STATIC add_library( subnormal_use_default STATIC
@ -154,7 +155,7 @@ if( ENABLE_RUNTIME_SUBNORMAL )
add_library( subnormal_disable STATIC add_library( subnormal_disable STATIC
generic/lib/subnormal_disable.ll ) generic/lib/subnormal_disable.ll )
install( TARGETS subnormal_use_default subnormal_disable ARCHIVE install( TARGETS subnormal_use_default subnormal_disable ARCHIVE
DESTINATION lib/clc ) DESTINATION ${CMAKE_INSTALL_DATADIR}/clc )
endif() endif()
find_program( PYTHON python ) find_program( PYTHON python )
@ -274,7 +275,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
prepare_builtins ) prepare_builtins )
add_custom_target( "prepare-${obj_suffix}" ALL add_custom_target( "prepare-${obj_suffix}" ALL
DEPENDS "${obj_suffix}" ) DEPENDS "${obj_suffix}" )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION lib/clc ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc )
# nvptx-- targets don't include workitem builtins # nvptx-- targets don't include workitem builtins
if( NOT ${t} MATCHES ".*ptx.*--$" ) if( NOT ${t} MATCHES ".*ptx.*--$" )
add_test( NAME external-calls-${obj_suffix} add_test( NAME external-calls-${obj_suffix}
@ -292,7 +293,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
create_symlink ${obj_suffix} create_symlink ${obj_suffix}
${alias_suffix} ${alias_suffix}
DEPENDS "prepare-${obj_suffix}" ) DEPENDS "prepare-${obj_suffix}" )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION lib/clc ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc )
endforeach( a ) endforeach( a )
endforeach( d ) endforeach( d )
endforeach( t ) endforeach( t )

4
libclc/libclc.pc.in
View File

@ -1,5 +1,5 @@
includedir=@CMAKE_INSTALL_PREFIX@/include includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
libexecdir=@CMAKE_INSTALL_PREFIX@/lib/clc libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc
Name: libclc Name: libclc
Description: Library requirements of the OpenCL C programming language Description: Library requirements of the OpenCL C programming language