libragephoto: set C standard by default to 99 and other changes

- CMakeLists.txt: set C standard by default to 99
- CMakeLists.txt: use generator expression for ICONV_LINKED
- RagePhotoConfig.h.in: update copyright year to 2025
- unicode.wasm: remove RAGEPHOTO_UNICODE_LIBS
- wasm.cmake: set C standard by default to 99
This commit is contained in:
Syping 2025-11-05 13:23:40 +01:00
parent f48bd286fe
commit c6de659a99
4 changed files with 11 additions and 13 deletions

View file

@ -91,7 +91,8 @@ else()
endif() endif()
endif() endif()
# RagePhoto C++ Standard # RagePhoto C/C++ Standard
set(RAGEPHOTO_C_STANDARD "99" CACHE STRING "libragephoto C standard")
set(RAGEPHOTO_CXX_STANDARD "11" CACHE STRING "libragephoto C++ standard") set(RAGEPHOTO_CXX_STANDARD "11" CACHE STRING "libragephoto C++ standard")
# RagePhoto Win32 Shared Resources # RagePhoto Win32 Shared Resources
@ -120,6 +121,8 @@ else()
) )
endif() endif()
set_target_properties(ragephoto PROPERTIES set_target_properties(ragephoto PROPERTIES
C_STANDARD ${RAGEPHOTO_C_STANDARD}
C_STANDARD_REQUIRED ON
CXX_STANDARD ${RAGEPHOTO_CXX_STANDARD} CXX_STANDARD ${RAGEPHOTO_CXX_STANDARD}
CXX_STANDARD_REQUIRED ON CXX_STANDARD_REQUIRED ON
) )
@ -136,7 +139,9 @@ 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_LIBS}) target_link_libraries(ragephoto PRIVATE
$<$<BOOL:${ICONV_LINKED}>:iconv>
)
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}"

View file

@ -17,15 +17,11 @@
****************************************************************************]] ****************************************************************************]]
set(RAGEPHOTO_UNICODE "" CACHE STRING "libragephoto Unicode implementation") set(RAGEPHOTO_UNICODE "" CACHE STRING "libragephoto Unicode implementation")
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_LIBS
${RAGEPHOTO_UNICODE_LIBS}
)
message("-- UnicodeCvt - ${RAGEPHOTO_UNICODE}") message("-- UnicodeCvt - ${RAGEPHOTO_UNICODE}")
else() else()
# RagePhoto test source files # RagePhoto test source files
@ -92,11 +88,6 @@ else()
list(APPEND LIBRAGEPHOTO_DEFINES list(APPEND LIBRAGEPHOTO_DEFINES
UNICODE_ICONV UNICODE_ICONV
) )
if (ICONV_LINKED)
list(APPEND LIBRAGEPHOTO_LIBS
iconv
)
endif()
message("-- UnicodeCvt - iconv") message("-- UnicodeCvt - iconv")
else() else()
message("-- UnicodeCvt - none") message("-- UnicodeCvt - none")

View file

@ -1,6 +1,6 @@
#[[************************************************************************** #[[**************************************************************************
* libragephoto RAGE Photo Parser * libragephoto RAGE Photo Parser
* Copyright (C) 2023-2024 Syping * Copyright (C) 2023-2025 Syping
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met: * are permitted provided that the following conditions are met:
@ -21,6 +21,8 @@ add_executable(ragephoto-wasm
${RAGEPHOTO_SOURCES} ${RAGEPHOTO_SOURCES}
) )
set_target_properties(ragephoto-wasm PROPERTIES set_target_properties(ragephoto-wasm PROPERTIES
C_STANDARD ${RAGEPHOTO_C_STANDARD}
C_STANDARD_REQUIRED ON
CXX_STANDARD ${RAGEPHOTO_CXX_STANDARD} CXX_STANDARD ${RAGEPHOTO_CXX_STANDARD}
CXX_STANDARD_REQUIRED ON CXX_STANDARD_REQUIRED ON
PREFIX "lib" PREFIX "lib"

View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* libragephoto RAGE Photo Parser * libragephoto RAGE Photo Parser
* Copyright (C) 2023-2024 Syping * Copyright (C) 2023-2025 Syping
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met: * are permitted provided that the following conditions are met: