From edb0b19c6f6baf14948e0f95f7932c0d924c50b1 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Sat, 14 Jan 2023 07:48:00 -0500 Subject: [PATCH] Move iqa sources to file --- cmake/bimg/3rdparty/iqa.cmake | 25 +++++++++++++++++++++++++ cmake/bimg/CMakeLists.txt | 1 + cmake/bimg/bimg_encode.cmake | 6 +++--- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 cmake/bimg/3rdparty/iqa.cmake diff --git a/cmake/bimg/3rdparty/iqa.cmake b/cmake/bimg/3rdparty/iqa.cmake new file mode 100644 index 0000000..4e1c40a --- /dev/null +++ b/cmake/bimg/3rdparty/iqa.cmake @@ -0,0 +1,25 @@ +# bgfx.cmake - bgfx building in cmake +# Written in 2017 by Joshua Brookover +# +# To the extent possible under law, the author(s) have dedicated all copyright +# and related and neighboring rights to this software to the public domain +# worldwide. This software is distributed without any warranty. +# +# You should have received a copy of the CC0 Public Domain Dedication along with +# this software. If not, see . + +# Ensure the directory exists +if(NOT IS_DIRECTORY ${BIMG_DIR}) + message(SEND_ERROR "Could not load bimg, directory does not exist. ${BIMG_DIR}") + return() +endif() + +if(NOT IQA_LIBRARIES) + file( + GLOB_RECURSE # + IQA_SOURCES # + ${BIMG_DIR}/3rdparty/iqa/include/**.h # + ${BIMG_DIR}/3rdparty/iqa/source/**.c # + ) + set(IQA_INCLUDE_DIR ${BIMG_DIR}/3rdparty/iqa/include) +endif() diff --git a/cmake/bimg/CMakeLists.txt b/cmake/bimg/CMakeLists.txt index 2427376..ce33066 100644 --- a/cmake/bimg/CMakeLists.txt +++ b/cmake/bimg/CMakeLists.txt @@ -12,6 +12,7 @@ include(3rdparty/loadpng.cmake) include(3rdparty/libsquish.cmake) include(3rdparty/astc_encoder.cmake) include(3rdparty/tinyexr.cmake) +include(3rdparty/iqa.cmake) include(3rdparty/miniz.cmake) include(bimg.cmake) include(bimg_decode.cmake) diff --git a/cmake/bimg/bimg_encode.cmake b/cmake/bimg/bimg_encode.cmake index 2486349..078e22b 100644 --- a/cmake/bimg/bimg_encode.cmake +++ b/cmake/bimg/bimg_encode.cmake @@ -25,9 +25,9 @@ target_include_directories( PRIVATE ${BIMG_DIR}/3rdparty # ${LIBSQUISH_INCLUDE_DIR} # ${ASTC_ENCODER_INCLUDE_DIR} - ${BIMG_DIR}/3rdparty/iqa/include # ${BIMG_DIR}/3rdparty/nvtt # ${TINYEXR_INCLUDE_DIR} # + ${IQA_INCLUDE_DIR} # ${MINIZ_INCLUDE_DIR} # ) @@ -49,8 +49,7 @@ file( ${BIMG_DIR}/3rdparty/pvrtc/**.cpp # ${BIMG_DIR}/3rdparty/pvrtc/**.h # ${TINYEXR_SOURCES} - ${BIMG_DIR}/3rdparty/iqa/include/**.h # - ${BIMG_DIR}/3rdparty/iqa/source/**.c # + ${IQA_SOURCES} # ) target_sources(bimg_encode PRIVATE ${BIMG_ENCODE_SOURCES}) @@ -61,6 +60,7 @@ target_link_libraries( ${LIBSQUISH_LIBRARIES} # ${ASTC_ENCODER_LIBRARIES} # ${TINYEXR_LIBRARIES} # + ${IQA_LIBRARIES} # ) include(CheckCXXCompilerFlag)