TurboJpeg Cmake Fix (#97)

ROCm · Feb 13, 2024 · 076b153 · 076b153
1 parent cfcb95d
commit 076b153
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/cmake/FindTurboJpeg.cmake b/cmake/FindTurboJpeg.cmake
@@ -53,19 +53,6 @@ find_library(TurboJpeg_LIBRARIES
 )
 mark_as_advanced(TurboJpeg_LIBRARIES)
 
-find_path(TurboJpeg_LIBRARIES_DIRS
-    NAMES libturbojpeg${SHARED_LIB_TYPE}
-    HINTS
-    $ENV{TURBO_JPEG_PATH}/lib
-    $ENV{TURBO_JPEG_PATH}/lib64
-    PATHS
-    ${TURBO_JPEG_PATH}/lib
-    ${TURBO_JPEG_PATH}/lib64
-    /usr/lib
-    /opt/libjpeg-turbo/lib
-)
-mark_as_advanced(TurboJpeg_LIBRARIES_DIRS)
-
 if(TurboJpeg_LIBRARIES AND TurboJpeg_INCLUDE_DIRS)
     set(TurboJpeg_FOUND TRUE)
 endif( )
@@ -76,13 +63,11 @@ find_package_handle_standard_args( TurboJpeg
     REQUIRED_VARS
         TurboJpeg_LIBRARIES 
         TurboJpeg_INCLUDE_DIRS
-        TurboJpeg_LIBRARIES_DIRS
 )
 
 set(TurboJpeg_FOUND ${TurboJpeg_FOUND} CACHE INTERNAL "")
 set(TurboJpeg_LIBRARIES ${TurboJpeg_LIBRARIES} CACHE INTERNAL "")
 set(TurboJpeg_INCLUDE_DIRS ${TurboJpeg_INCLUDE_DIRS} CACHE INTERNAL "")
-set(TurboJpeg_LIBRARIES_DIRS ${TurboJpeg_LIBRARIES_DIRS} CACHE INTERNAL "")
 
 if(TurboJpeg_FOUND)
     message("-- ${White}Using Turbo JPEG -- \n\tLibraries:${TurboJpeg_LIBRARIES} \n\tIncludes:${TurboJpeg_INCLUDE_DIRS}${ColourReset}")   

diff --git a/rocAL/CMakeLists.txt b/rocAL/CMakeLists.txt
@@ -256,7 +256,7 @@ if(${BUILD_ROCAL})
     protobuf_generate_cpp(TF_PROTO_SRCS TF_PROTO_HEADERS proto/example.proto proto/feature.proto)
     protobuf_generate_cpp(CAFFE2_PROTO_SRCS CAFFE2_PROTO_HEADERS proto/caffe2_protos.proto)
     protobuf_generate_cpp(CAFFE_PROTO_SRCS CAFFE_PROTO_HEADERS proto/caffe_protos.proto)
-    link_directories(${AMDRPP_LIBRARIES_DIRS} ${TurboJpeg_LIBRARIES_DIRS} ${PROTOBUF_LIBRARY_DIRS} /usr/local/lib/)
+    link_directories(${AMDRPP_LIBRARIES_DIRS} ${PROTOBUF_LIBRARY_DIRS} /usr/local/lib/)
 
     file(GLOB_RECURSE SOURCES "source/*.cpp")
     add_library(${PROJECT_NAME} SHARED ${SOURCES} ${TF_PROTO_SRCS} ${TF_PROTO_HEADERS} ${CAFFE_PROTO_HEADERS} ${CAFFE_PROTO_SRCS} ${CAFFE2_PROTO_SRCS} ${CAFFE2_PROTO_HEADERS})