From 2c8ebdf0d26065c3280fa875cb599637ece27262 Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Mon, 4 May 2020 03:37:31 +0200 Subject: [PATCH] ocioconf: replace script with cmake --- app/render/ocioconf/CMakeLists.txt | 10 +++++++++- app/render/ocioconf/gen-qrc.sh | 17 ----------------- app/render/ocioconf/ocioconf.qrc | 19 ------------------- app/render/ocioconf/ocioconf.qrc.in | 5 +++++ 4 files changed, 14 insertions(+), 37 deletions(-) delete mode 100755 app/render/ocioconf/gen-qrc.sh delete mode 100644 app/render/ocioconf/ocioconf.qrc create mode 100644 app/render/ocioconf/ocioconf.qrc.in diff --git a/app/render/ocioconf/CMakeLists.txt b/app/render/ocioconf/CMakeLists.txt index 72fff96aa..faa7b5e40 100644 --- a/app/render/ocioconf/CMakeLists.txt +++ b/app/render/ocioconf/CMakeLists.txt @@ -14,8 +14,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +file(GLOB_RECURSE OCIOCONF_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.ocio *.spi3d *.spi1d) +set(QRC_BODY "") +foreach(OCIOCONF_FILE ${OCIOCONF_RESOURCES}) + string(APPEND QRC_BODY "${OCIOCONF_FILE}\n") + configure_file(${OCIOCONF_FILE} ${OCIOCONF_FILE} COPYONLY) +endforeach() +configure_file(ocioconf.qrc.in ocioconf.qrc @ONLY) + set(OLIVE_RESOURCES ${OLIVE_RESOURCES} - render/ocioconf/ocioconf.qrc + ${CMAKE_CURRENT_BINARY_DIR}/ocioconf.qrc PARENT_SCOPE ) diff --git a/app/render/ocioconf/gen-qrc.sh b/app/render/ocioconf/gen-qrc.sh deleted file mode 100755 index 448f6b4b2..000000000 --- a/app/render/ocioconf/gen-qrc.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -ourbasename=$(basename "$0") - -rm ocioconf.qrc -echo "" >> ocioconf.qrc -echo " " >> ocioconf.qrc - -for f in $(find * -type f) -do - if [ "$f" != "CMakeLists.txt" ] && [ "$f" != "ocioconf.qrc" ] && [ "$f" != "$ourbasename" ] - then - echo " $f" >> ocioconf.qrc - fi -done - -echo " " >> ocioconf.qrc -echo "" >> ocioconf.qrc diff --git a/app/render/ocioconf/ocioconf.qrc b/app/render/ocioconf/ocioconf.qrc deleted file mode 100644 index badfdb9b2..000000000 --- a/app/render/ocioconf/ocioconf.qrc +++ /dev/null @@ -1,19 +0,0 @@ - - - config.ocio - looks/Filmic_False_Colour.spi3d - looks/Filmic_to_0-35_1-30.spi1d - looks/Filmic_to_0-48_1-09.spi1d - looks/Filmic_to_0-60_1-04.spi1d - looks/Filmic_to_0-70_1-03.spi1d - looks/Filmic_to_0-85_1-011.spi1d - looks/Filmic_to_0.99_1-0075.spi1d - looks/Filmic_to_1.20_1-00.spi1d - luts/F-Log_to_Linear.spi1d - luts/V-Log_to_linear.spi1d - luts/V3_LogC_400_to_linear.spi1d - luts/V3_LogC_800_to_linear.spi1d - luts/desat65cube.spi3d - luts/sRGB_OETF_to_Linear.spi1d - - diff --git a/app/render/ocioconf/ocioconf.qrc.in b/app/render/ocioconf/ocioconf.qrc.in new file mode 100644 index 000000000..7d9cdfce9 --- /dev/null +++ b/app/render/ocioconf/ocioconf.qrc.in @@ -0,0 +1,5 @@ + + + @QRC_BODY@ + +