Skip to content

Commit

Permalink
charls: use 'CharLS::charls' case
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Oct 25, 2021
1 parent 828ac0f commit f140a99
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions cmake/modules/packages/FindCharLS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ set_package_properties(CharLS PROPERTIES
if(CharLS_FOUND)
set(CharLS_LIBRARIES ${CharLS_LIBRARY})
set(CharLS_INCLUDE_DIRS ${CharLS_INCLUDE_DIR})
if(NOT TARGET CharLS::CharLS)
add_library(CharLS::CharLS UNKNOWN IMPORTED)
if(NOT TARGET CharLS::charls)
add_library(CharLS::charls UNKNOWN IMPORTED)
if(CharLS_INCLUDE_DIRS)
set_target_properties(CharLS::CharLS PROPERTIES
set_target_properties(CharLS::charls PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CharLS_INCLUDE_DIR})
endif()
if(EXISTS "${CharLS_LIBRARY}")
set_target_properties(CharLS::CharLS PROPERTIES
set_target_properties(CharLS::charls PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
IMPORTED_LOCATION ${CharLS_LIBRARY})
endif()
Expand Down
2 changes: 1 addition & 1 deletion gdal/frmts/jpegls/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_gdal_driver(TARGET gdal_JPEGLS SOURCES jpegls_header.h jpeglsdataset.cpp)
gdal_standard_includes(gdal_JPEGLS)
gdal_target_link_libraries(TARGET gdal_JPEGLS LIBRARIES CharLS::CharLS)
gdal_target_link_libraries(TARGET gdal_JPEGLS LIBRARIES CharLS::charls)

if (CharLS_VERSION STREQUAL 1)
target_compile_definitions(gdal_JPEGLS PRIVATE -DCHARLS_INTERFACE_H)
Expand Down

0 comments on commit f140a99

Please sign in to comment.