Syping/libragephoto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libragephoto: rename CMake *_LIBRARIES to *_LIBS

Browse source
This commit is contained in:
Syping 2025-10-21 21:47:02 +02:00
parent 9322e1943d
commit 8e9d4dfcc2
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -136,7 +136,7 @@ target_include_directories(ragephoto PUBLIC
"${ragephoto_BINARY_DIR}/include" "${ragephoto_BINARY_DIR}/include"
"${ragephoto_SOURCE_DIR}/src/core" "${ragephoto_SOURCE_DIR}/src/core"
) )
target_link_libraries(ragephoto PRIVATE ${LIBRAGEPHOTO_LIBRARIES}) target_link_libraries(ragephoto PRIVATE ${LIBRAGEPHOTO_LIBS})
install(TARGETS ragephoto install(TARGETS ragephoto
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

10
cmake/unicode.cmake
View file

@ -17,14 +17,14 @@
****************************************************************************]] ****************************************************************************]]
set(RAGEPHOTO_UNICODE "" CACHE STRING "libragephoto Unicode implementation") set(RAGEPHOTO_UNICODE "" CACHE STRING "libragephoto Unicode implementation")
set(RAGEPHOTO_UNICODE_LIBRARIES "" CACHE STRING "libragephoto Unicode libraries") set(RAGEPHOTO_UNICODE_LIBS "" CACHE STRING "libragephoto Unicode libraries")
if (RAGEPHOTO_UNICODE) if (RAGEPHOTO_UNICODE)
string(TOUPPER "UNICODE_${RAGEPHOTO_UNICODE}" UNICODE_DEF) string(TOUPPER "UNICODE_${RAGEPHOTO_UNICODE}" UNICODE_DEF)
list(APPEND LIBRAGEPHOTO_DEFINES list(APPEND LIBRAGEPHOTO_DEFINES
${UNICODE_DEF} ${UNICODE_DEF}
) )
list(APPEND LIBRAGEPHOTO_LIBRARIES list(APPEND LIBRAGEPHOTO_LIBS
${RAGEPHOTO_UNICODE_LIBRARIES} ${RAGEPHOTO_UNICODE_LIBS}
) )
message("-- UnicodeCvt - ${RAGEPHOTO_UNICODE}") message("-- UnicodeCvt - ${RAGEPHOTO_UNICODE}")
else() else()
@ -41,7 +41,7 @@ else()
# RagePhoto Unicode functionality tests # RagePhoto Unicode functionality tests
if (NOT RAGEPHOTO_C_LIBRARY) if (NOT RAGEPHOTO_C_LIBRARY)
message("-- Testing codecvt") message("-- Testing codecvt")
try_run(CODECVT_RUN CODECVT_COMPILE "${PROJECT_BINARY_DIR}" ${CODECVT_SOURCE}) try_run(CODECVT_RUN CODECVT_COMPILE "${PROJECT_BINARY_DIR}" "${CODECVT_SOURCE}")
if (CODECVT_COMPILE AND CODECVT_RUN EQUAL 0) if (CODECVT_COMPILE AND CODECVT_RUN EQUAL 0)
set(CODECVT_COMPAT TRUE) set(CODECVT_COMPAT TRUE)
message("-- Testing codecvt - yes") message("-- Testing codecvt - yes")
@ -93,7 +93,7 @@ else()
UNICODE_ICONV UNICODE_ICONV
) )
if (ICONV_LINKED) if (ICONV_LINKED)
list(APPEND LIBRAGEPHOTO_LIBRARIES list(APPEND LIBRAGEPHOTO_LIBS
iconv iconv
) )
endif() endif()