rocjpeg - CMake Find updates (#164)
* rocjpeg - CMake Find updates * Version file - fix * Changelog - updates * Cleanup * Test - cmakelists updates * header - minor fix --------- Co-authored-by: Kiriti <kiriti@santiago.amd.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
9642492832
Коммит
bdb12b59fb
+17
-14
@@ -58,22 +58,25 @@ include(CTest)
|
||||
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)
|
||||
|
||||
# find rocjpeg
|
||||
find_package(ROCJPEG QUIET)
|
||||
|
||||
if(ROCJPEG_FOUND)
|
||||
message("-- ${White}${PROJECT_NAME}: rocJPEG found with find_package(ROCJPEG QUIET)${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_INCLUDE_DIR -- ${ROCJPEG_INCLUDE_DIR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_LIB_DIR -- ${ROCJPEG_LIB_DIR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_LIBRARY -- ${ROCJPEG_LIBRARY}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_FOUND -- ${ROCJPEG_FOUND}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION -- ${ROCJPEG_VERSION}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION_MAJOR -- ${ROCJPEG_VERSION_MAJOR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION_MINOR -- ${ROCJPEG_VERSION_MINOR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION_PATCH -- ${ROCJPEG_VERSION_PATCH}${ColourReset}")
|
||||
if(BUILD_FROM_SOURCE)
|
||||
message("-- ${White}${PROJECT_NAME}: CTests requires rocjpeg installed before running CTests")
|
||||
else()
|
||||
message("-- ${Yellow}${PROJECT_NAME} requires rocJPEG. Install rocJPEG before running CTests")
|
||||
endif(ROCJPEG_FOUND)
|
||||
find_package(rocjpeg QUIET)
|
||||
|
||||
if(rocjpeg_FOUND)
|
||||
message("-- ${White}${PROJECT_NAME}: rocjpeg found with find_package(rocjpeg QUIET)${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_INCLUDE_DIR -- ${rocjpeg_INCLUDE_DIR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_LIB_DIR -- ${rocjpeg_LIB_DIR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_LIBRARY -- ${rocjpeg_LIBRARY}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_FOUND -- ${rocjpeg_FOUND}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION -- ${rocjpeg_VERSION}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION_MAJOR -- ${rocjpeg_VERSION_MAJOR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION_MINOR -- ${rocjpeg_VERSION_MINOR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION_PATCH -- ${rocjpeg_VERSION_PATCH}${ColourReset}")
|
||||
else()
|
||||
message("-- ${Yellow}${PROJECT_NAME} requires rocjpeg. Install rocjpeg before running CTests")
|
||||
endif(rocjpeg_FOUND)
|
||||
endif(BUILD_FROM_SOURCE)
|
||||
|
||||
add_test(
|
||||
NAME
|
||||
|
||||
@@ -70,7 +70,7 @@ if(HIP_FOUND AND rocjpeg_FOUND AND rocprofiler-register_FOUND)
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host)
|
||||
# rocJPEG and utils
|
||||
include_directories (${rocjpeg_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${rocjpeg_LIBRARY})
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocjpeg::rocjpeg)
|
||||
# rocprofiler-register
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register)
|
||||
# sample app exe
|
||||
|
||||
Ссылка в новой задаче
Block a user