Skip to content

Revert "bump to 1.3.1" #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Revert "bump to 1.3.1" #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
831ddd4
Revert "bump to 1.3.1"
DichenZhang1 Jan 10, 2025
db56172
Revert "add gles include dirs to the list of include paths"
DichenZhang1 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif()

set(UHDR_MAJOR_VERSION 1)
set(UHDR_MINOR_VERSION 3)
set(UHDR_PATCH_VERSION 1)
set(UHDR_PATCH_VERSION 0)
project(libuhdr
VERSION ${UHDR_MAJOR_VERSION}.${UHDR_MINOR_VERSION}.${UHDR_PATCH_VERSION}
LANGUAGES C CXX
Expand Down Expand Up @@ -580,11 +580,7 @@ file(GLOB UHDR_BM_SRCS_LIST "${BENCHMARK_DIR}/*.cpp")
file(GLOB IMAGE_IO_SRCS_LIST "${THIRD_PARTY_DIR}/image_io/src/**/*.cc")

set(PRIVATE_INCLUDE_DIR ${SOURCE_DIR}/include/ ${JPEG_INCLUDE_DIRS})
set(PRIVATE_LINK_LIBS ${JPEG_LIBRARIES} Threads::Threads)
if(UHDR_ENABLE_GLES)
list(APPEND PRIVATE_INCLUDE_DIR ${EGL_INCLUDE_DIRS} ${OPENGLES3_INCLUDE_DIRS})
list(APPEND PRIVATE_LINK_LIBS ${EGL_LIBRARIES} ${OPENGLES3_LIBRARIES})
endif()
set(COMMON_LIBS_LIST ${JPEG_LIBRARIES} Threads::Threads)

###########################################################
# Targets
Expand Down Expand Up @@ -616,7 +612,10 @@ target_include_directories(${UHDR_CORE_LIB_NAME} PUBLIC ${EXPORT_INCLUDE_DIR})
if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
target_link_libraries(${UHDR_CORE_LIB_NAME} PUBLIC ${log-lib})
endif()
target_link_libraries(${UHDR_CORE_LIB_NAME} PRIVATE ${PRIVATE_LINK_LIBS} ${IMAGEIO_TARGET_NAME})
if(UHDR_ENABLE_GLES)
target_link_libraries(${UHDR_CORE_LIB_NAME} PRIVATE ${EGL_LIBRARIES} ${OPENGLES3_LIBRARIES})
endif()
target_link_libraries(${UHDR_CORE_LIB_NAME} PRIVATE ${COMMON_LIBS_LIST} ${IMAGEIO_TARGET_NAME})

if(UHDR_BUILD_EXAMPLES)
set(UHDR_SAMPLE_APP ultrahdr_app)
Expand Down Expand Up @@ -677,7 +676,7 @@ if(UHDR_BUILD_BENCHMARK)
target_link_libraries(ultrahdr_bm ${UHDR_CORE_LIB_NAME} ${BENCHMARK_LIBRARIES})

set(RES_FILE "${TESTS_DIR}/data/UltrahdrBenchmarkTestRes-1.2.zip")
set(RES_FILE_MD5SUM "14eac767ef7252051cc5658c4ad776d9")
set(RES_FILE_MD5SUM "31fc352444f95bc1ab4b9d6e397de6c1")
set(GET_RES_FILE TRUE)
if(EXISTS ${RES_FILE})
file(MD5 ${RES_FILE} CURR_MD5_SUM)
Expand Down Expand Up @@ -751,10 +750,13 @@ set(UHDR_TARGET_NAME uhdr)
add_library(${UHDR_TARGET_NAME})
add_dependencies(${UHDR_TARGET_NAME} ${UHDR_CORE_LIB_NAME})
target_compile_options(${UHDR_TARGET_NAME} PRIVATE ${UHDR_WERROR_FLAGS})
if(UHDR_ENABLE_GLES)
target_link_libraries(${UHDR_TARGET_NAME} PRIVATE ${EGL_LIBRARIES} ${OPENGLES3_LIBRARIES})
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
target_link_libraries(${UHDR_TARGET_NAME} PRIVATE ${log-lib})
endif()
target_link_libraries(${UHDR_TARGET_NAME} PRIVATE ${PRIVATE_LINK_LIBS})
target_link_libraries(${UHDR_TARGET_NAME} PRIVATE ${JPEG_LIBRARIES})
set_target_properties(${UHDR_TARGET_NAME}
PROPERTIES PUBLIC_HEADER ultrahdr_api.h)
if(BUILD_SHARED_LIBS)
Expand All @@ -771,10 +773,13 @@ if(BUILD_SHARED_LIBS)
add_library(${UHDR_TARGET_NAME_STATIC} STATIC)
add_dependencies(${UHDR_TARGET_NAME_STATIC} ${UHDR_CORE_LIB_NAME})
target_compile_options(${UHDR_TARGET_NAME_STATIC} PRIVATE ${UHDR_WERROR_FLAGS})
if(UHDR_ENABLE_GLES)
target_link_libraries(${UHDR_TARGET_NAME_STATIC} PRIVATE ${EGL_LIBRARIES} ${OPENGLES3_LIBRARIES})
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
target_link_libraries(${UHDR_TARGET_NAME_STATIC} PRIVATE ${log-lib})
endif()
target_link_libraries(${UHDR_TARGET_NAME_STATIC} PRIVATE ${PRIVATE_LINK_LIBS})
target_link_libraries(${UHDR_TARGET_NAME_STATIC} PRIVATE ${JPEG_LIBRARIES})
combine_static_libs(${UHDR_CORE_LIB_NAME} ${UHDR_TARGET_NAME_STATIC})
if(NOT MSVC)
set_target_properties(${UHDR_TARGET_NAME_STATIC}
Expand Down
3 changes: 1 addition & 2 deletions ultrahdr_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,12 @@
* existing API which warrants a major version update.
* But indicated as a minor update.
* 1.3.0 1.3.0 Some bug fixes, introduced new API.
* 1.3.1 1.3.1 quality improvements, bug fixes, added new features
*/

// This needs to be kept in sync with version in CMakeLists.txt
#define UHDR_LIB_VER_MAJOR 1
#define UHDR_LIB_VER_MINOR 3
#define UHDR_LIB_VER_PATCH 1
#define UHDR_LIB_VER_PATCH 0

#define UHDR_LIB_VERSION \
((UHDR_LIB_VER_MAJOR * 10000) + (UHDR_LIB_VER_MINOR * 100) + UHDR_LIB_VER_PATCH)
Expand Down
Loading