[Bf-blender-cvs] [b13a92a238d] master: Cleanup: wrap long lines in CMake

[Campbell Barton]

Commit: b13a92a238d4fac149d7743554203b0a759be056
Author: Campbell Barton
Date:   Thu Dec 15 10:54:13 2022 +1100
Branches: master
https://developer.blender.org/rBb13a92a238d4fac149d7743554203b0a759be056

Cleanup: wrap long lines in CMake

Also remove `mingw_LIBDIR` from PKG_CONFIG_PATH since it's not a
package-file path.

===================================================================

M       build_files/build_environment/cmake/harfbuzz.cmake
M       build_files/build_environment/cmake/sndfile.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/harfbuzz.cmake 
b/build_files/build_environment/cmake/harfbuzz.cmake
index d34d312c9d8..5f57ab6c0ff 100644
--- a/build_files/build_environment/cmake/harfbuzz.cmake
+++ b/build_files/build_environment/cmake/harfbuzz.cmake
@@ -5,7 +5,12 @@ if(WIN32)
   set(HARFBUZZ_PKG_ENV FREETYPE_DIR=${LIBDIR}/freetype)
 else()
   set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV})
-  set(HARFBUZZ_PKG_ENV 
PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig:${LIBDIR}/lib/python3.10/pkgconfig:$PKG_CONFIG_PATH)
+  set(HARFBUZZ_PKG_ENV "PKG_CONFIG_PATH=\
+${LIBDIR}/freetype/lib/pkgconfig:\
+${LIBDIR}/brotli/lib/pkgconfig:\
+${LIBDIR}/lib/python3.10/pkgconfig:\
+$PKG_CONFIG_PATH"
+  )
 endif()
 
 set(HARFBUZZ_EXTRA_OPTIONS
@@ -23,8 +28,16 @@ ExternalProject_Add(external_harfbuzz
   URL_HASH ${HARFBUZZ_HASH_TYPE}=${HARFBUZZ_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/harfbuzz
+
   CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} &&
-    ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV} ${MESON} setup --prefix 
${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir 
lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build 
${BUILD_DIR}/harfbuzz/src/external_harfbuzz
+  ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV}
+  ${MESON} setup
+  --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS}
+  --default-library static
+  --libdir lib
+  ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build
+  ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
+
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
   INSTALL_DIR ${LIBDIR}/harfbuzz
@@ -46,4 +59,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
     DEPENDEES install
   )
 endif()
-
diff --git a/build_files/build_environment/cmake/sndfile.cmake 
b/build_files/build_environment/cmake/sndfile.cmake
index ff57ffe7c28..3ea4c776e56 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -4,7 +4,12 @@ set(SNDFILE_EXTRA_ARGS)
 set(SNDFILE_ENV)
 
 if(WIN32)
-  set(SNDFILE_ENV 
PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR})
+  set(SNDFILE_ENV "PKG_CONFIG_PATH=\
+${mingw_LIBDIR}/ogg/lib/pkgconfig:\
+${mingw_LIBDIR}/vorbis/lib/pkgconfig:\
+${mingw_LIBDIR}/flac/lib/pkgconfig:\
+${mingw_LIBDIR}/opus/lib/pkgconfig"
+)
   set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
   # Shared for windows because static libs will drag in a libgcc dependency.
   set(SNDFILE_OPTIONS --disable-static --enable-shared )
@@ -19,7 +24,10 @@ if(UNIX AND NOT APPLE)
   #
   # Replace: Cflags: -I${includedir}/opus
   # With:    Cflags: -I${includedir}
-  set(SNDFILE_ENV sed -i s/{includedir}\\/opus/{includedir}/g 
${LIBDIR}/opus/lib/pkgconfig/opus.pc && ${SNDFILE_ENV})
+  set(SNDFILE_ENV
+    sed -i s/{includedir}\\/opus/{includedir}/g 
${LIBDIR}/opus/lib/pkgconfig/opus.pc &&
+    ${SNDFILE_ENV}
+  )
 endif()
 
 ExternalProject_Add(external_sndfile

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs