From 900f272622f058d4fb0f4575fcdd733c7377ff57 Mon Sep 17 00:00:00 2001 From: James Edwards Date: Wed, 15 Feb 2017 08:26:30 -0600 Subject: [PATCH] Fixes to HSA CMakeList.txt files Change-Id: Idd176d24dfd22bd9a6a8860ab035fd5d1aca756d --- runtime/hsa-ext-finalize/CMakeLists.txt | 9 +++------ runtime/hsa-ext-image/CMakeLists.txt | 11 +++++------ runtime/hsa-runtime-tools/CMakeLists.txt | 7 +++---- runtime/hsa-runtime/CMakeLists.txt | 10 +++++----- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/runtime/hsa-ext-finalize/CMakeLists.txt b/runtime/hsa-ext-finalize/CMakeLists.txt index c1a69ab24e..abe5da593b 100755 --- a/runtime/hsa-ext-finalize/CMakeLists.txt +++ b/runtime/hsa-ext-finalize/CMakeLists.txt @@ -17,7 +17,6 @@ endif() ## Set ext runtime module name and project name. set ( FINALIZE_NAME "hsa-ext-finalize" ) -set ( FINALIZE_COMPONENT "lib${FINALIZE_NAME}" ) set ( FINALIZE_TARGET "${FINALIZE_NAME}64" ) project ( ${FINALIZE_TARGET} ) @@ -60,8 +59,8 @@ find_file ( HSA_INC "hsa/hsa.h" ) find_library ( HSA_LIB libhsa-runtime64.so ) get_filename_component ( HSA_LIB_PATH ${HSA_LIB} DIRECTORY ) get_filename_component ( HSA_INC_PATH ${HSA_INC} DIRECTORY ) -include_directories ( ${HSA_BUILD_INC_PATH} ) -link_directories (${HSA_BUILD_LIB_PATH}) +include_directories ( ${HSA_INC_PATH} ) +link_directories (${HSA_LIB_PATH}) ## Find the external library files and set the link command find_library ( HSAIL_LIB libhsail.a ) @@ -154,8 +153,6 @@ set_property ( TARGET ${FINALIZE_TARGET} PROPERTY VERSION "${LIB_VERSION_STRING} set_property ( TARGET ${FINALIZE_TARGET} PROPERTY SOVERSION "${BUILD_VERSION_MAJOR}" ) ## Add the core runtime in the link -link_directories(${HSA_BUILD_LIB_PATH}) - target_link_libraries ( ${FINALIZE_TARGET} PRIVATE ${LIBAMDHSAFIN} @@ -177,4 +174,4 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) endif () ## Set install information -install ( TARGETS ${FINALIZE_TARGET} LIBRARY DESTINATION lib COMPONENT ${FINALIZE_COMPONENT}) +install ( TARGETS ${FINALIZE_TARGET} LIBRARY DESTINATION hsa/lib ) diff --git a/runtime/hsa-ext-image/CMakeLists.txt b/runtime/hsa-ext-image/CMakeLists.txt index 34f66ce20e..2774905468 100755 --- a/runtime/hsa-ext-image/CMakeLists.txt +++ b/runtime/hsa-ext-image/CMakeLists.txt @@ -17,7 +17,6 @@ endif() ## Set ext runtime module name and project name. set ( IMAGE_NAME "hsa-ext-image" ) -set ( IMAGE_COMPONENT "lib${IMAGE_NAME}" ) set ( IMAGE_TARGET "${IMAGE_NAME}64" ) project ( ${IMAGE_TARGET} ) @@ -52,16 +51,16 @@ find_file ( HSAKMT_INC "libhsakmt/hsakmt.h" ) find_library ( HSAKMT_LIB libhsakmt.so ) get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY ) get_filename_component ( HSAKMT_INC_PATH ${HSAKMT_INC} DIRECTORY ) -include_directories ( ${HSAKMT_BUILD_INC_PATH} ) -link_directories (${HSAKMT_BUILD_LIB_PATH}) +include_directories ( ${HSAKMT_INC_PATH} ) +link_directories (${HSAKMT_LIB_PATH}) ## Find the hsa-runtime and include files find_file ( HSA_INC "hsa/hsa.h" ) find_library ( HSA_LIB libhsa-runtime64.so ) get_filename_component ( HSA_LIB_PATH ${HSA_LIB} DIRECTORY ) get_filename_component ( HSA_INC_PATH ${HSA_INC} DIRECTORY ) -include_directories ( ${HSA_BUILD_INC_PATH} ) -link_directories (${HSA_BUILD_LIB_PATH}) +include_directories ( ${HSA_INC_PATH} ) +link_directories (${HSA_LIB_PATH}) ## Find the libhsail files in the link find_library ( HSAIL_LIB libhsail.a ) @@ -171,4 +170,4 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) endif () ## Set install information -install ( TARGETS ${IMAGE_TARGET} LIBRARY DESTINATION hsa/lib COMPONENT ${IMAGE_COMPONENT}) +install ( TARGETS ${IMAGE_TARGET} LIBRARY DESTINATION hsa/lib ) diff --git a/runtime/hsa-runtime-tools/CMakeLists.txt b/runtime/hsa-runtime-tools/CMakeLists.txt index 0e88007d43..2ae622e390 100755 --- a/runtime/hsa-runtime-tools/CMakeLists.txt +++ b/runtime/hsa-runtime-tools/CMakeLists.txt @@ -5,7 +5,6 @@ set ( CMAKE_VERBOSE_MAKEFILE on ) ## Set ext runtime module name and project name. set ( TOOLS_NAME "hsa-runtime-tools" ) -set ( TOOLS_COMPONENT "lib${TOOLS_NAME}" ) set ( TOOLS_TARGET "${TOOLS_NAME}64" ) project ( ${TOOLS_TARGET} ) @@ -48,8 +47,8 @@ find_file ( HSA_INC "hsa/hsa.h" ) find_library ( HSA_LIB libhsa-runtime64.so ) get_filename_component ( HSA_LIB_PATH ${HSA_LIB} DIRECTORY ) get_filename_component ( HSA_INC_PATH ${HSA_INC} DIRECTORY ) -include_directories ( ${HSA_BUILD_INC_PATH} ) -link_directories (${HSA_BUILD_LIB_PATH}) +include_directories ( ${HSA_INC_PATH} ) +link_directories (${HSA_LIB_PATH}) ## External dependencies if ( NOT DEFINED REG_INCLUDE ) @@ -242,5 +241,5 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) endif () ## Set install information -install ( TARGETS ${TOOLS_TARGET} LIBRARY DESTINATION hsa/lib COMPONENT ${TOOLS_COMPONENT} ) +install ( TARGETS ${TOOLS_TARGET} LIBRARY DESTINATION hsa/lib ) install ( DIRECTORY ${TOOLS_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa FILES_MATCHING PATTERN "*.h" ) diff --git a/runtime/hsa-runtime/CMakeLists.txt b/runtime/hsa-runtime/CMakeLists.txt index d1b7387c13..7c9ef0c847 100644 --- a/runtime/hsa-runtime/CMakeLists.txt +++ b/runtime/hsa-runtime/CMakeLists.txt @@ -47,8 +47,8 @@ set ( CMAKE_VERBOSE_MAKEFILE on ) ## Set core runtime module name and project name. set ( CORE_RUNTIME_NAME "hsa-runtime" ) -set ( CORE_RUNTIME_COMPONENT "lib${CORE_RUNTIME_NAME}" ) set ( CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64" ) +set ( CORE_RUNTIME_LIBRARY "lib${CORE_RUNTIME_TARGET}" ) project( ${CORE_RUNTIME_TARGET} ) list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" ) @@ -166,14 +166,14 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) endif () ## Create symlinks for packaging and install -add_custom_target ( ${CORE_RUNTIME_COMPONENT} ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link ) -add_custom_target ( ${CORE_RUNTIME_COMPONENT}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_COMPONENT}.so ${CORE_RUNTIME_COMPONENT}.so-link ) +add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link ) +add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link ) ## Set install information -install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib COMPONENT ${CORE_RUNTIME_COMPONENT} ) +install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib ) install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa ) install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa ) -install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_COMPONENT}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_COMPONENT}.so ) +install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so ) ## Packaging directives set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" )