From 8e9d4dfcc249df1de9cb65e99b88bd160b1ed8dd Mon Sep 17 00:00:00 2001 From: Syping Date: Tue, 21 Oct 2025 21:47:02 +0200 Subject: [PATCH] libragephoto: rename CMake *_LIBRARIES to *_LIBS --- CMakeLists.txt | 2 +- cmake/unicode.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fbcb1e..c801070 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,7 @@ target_include_directories(ragephoto PUBLIC "${ragephoto_BINARY_DIR}/include" "${ragephoto_SOURCE_DIR}/src/core" ) -target_link_libraries(ragephoto PRIVATE ${LIBRAGEPHOTO_LIBRARIES}) +target_link_libraries(ragephoto PRIVATE ${LIBRAGEPHOTO_LIBS}) install(TARGETS ragephoto ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/cmake/unicode.cmake b/cmake/unicode.cmake index 91eeed5..079dd7f 100644 --- a/cmake/unicode.cmake +++ b/cmake/unicode.cmake @@ -17,14 +17,14 @@ ****************************************************************************]] 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) string(TOUPPER "UNICODE_${RAGEPHOTO_UNICODE}" UNICODE_DEF) list(APPEND LIBRAGEPHOTO_DEFINES ${UNICODE_DEF} ) - list(APPEND LIBRAGEPHOTO_LIBRARIES - ${RAGEPHOTO_UNICODE_LIBRARIES} + list(APPEND LIBRAGEPHOTO_LIBS + ${RAGEPHOTO_UNICODE_LIBS} ) message("-- UnicodeCvt - ${RAGEPHOTO_UNICODE}") else() @@ -41,7 +41,7 @@ else() # RagePhoto Unicode functionality tests if (NOT RAGEPHOTO_C_LIBRARY) 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) set(CODECVT_COMPAT TRUE) message("-- Testing codecvt - yes") @@ -93,7 +93,7 @@ else() UNICODE_ICONV ) if (ICONV_LINKED) - list(APPEND LIBRAGEPHOTO_LIBRARIES + list(APPEND LIBRAGEPHOTO_LIBS iconv ) endif()