Commit: 1324db0ad154f1006c772bd1bbed173cfe80bb5d
Author: Campbell Barton
Date: Wed Dec 14 14:21:51 2022 +1100
Branches: master
https://developer.blender.org/rB1324db0ad154f1006c772bd1bbed173cfe80bb5d
Cleanup: cmake indentation
===================================================================
M build_files/build_environment/cmake/cve_check.cmake
M build_files/build_environment/cmake/download.cmake
M build_files/build_environment/cmake/freetype.cmake
M build_files/build_environment/cmake/gmp.cmake
M build_files/build_environment/cmake/harvest.cmake
M build_files/build_environment/cmake/ispc.cmake
M build_files/build_environment/cmake/opencolorio.cmake
M build_files/build_environment/cmake/openjpeg.cmake
M build_files/build_environment/cmake/openpgl.cmake
M build_files/build_environment/cmake/potrace.cmake
M build_files/build_environment/cmake/pthreads.cmake
M build_files/build_environment/cmake/sndfile.cmake
M build_files/build_environment/cmake/yamlcpp.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/cve_check.cmake
b/build_files/build_environment/cmake/cve_check.cmake
index ac42444aef1..941b6b0cae9 100644
--- a/build_files/build_environment/cmake/cve_check.cmake
+++ b/build_files/build_environment/cmake/cve_check.cmake
@@ -26,13 +26,13 @@ set(SBOMCONTENTS)
get_cmake_property(_variableNames VARIABLES)
foreach (_variableName ${_variableNames})
if(_variableName MATCHES "CPE$")
- string(REPLACE ":" ";" CPE_LIST ${${_variableName}})
- string(REPLACE "_CPE" "_ID" CPE_DEPNAME ${_variableName})
- list(GET CPE_LIST 3 CPE_VENDOR)
- list(GET CPE_LIST 4 CPE_NAME)
- list(GET CPE_LIST 5 CPE_VERSION)
- set(${CPE_DEPNAME} "${CPE_VENDOR},${CPE_NAME},${CPE_VERSION}")
- set(SBOMCONTENTS
"${SBOMCONTENTS}${CPE_VENDOR},${CPE_NAME},${CPE_VERSION},,,\n")
+ string(REPLACE ":" ";" CPE_LIST ${${_variableName}})
+ string(REPLACE "_CPE" "_ID" CPE_DEPNAME ${_variableName})
+ list(GET CPE_LIST 3 CPE_VENDOR)
+ list(GET CPE_LIST 4 CPE_NAME)
+ list(GET CPE_LIST 5 CPE_VERSION)
+ set(${CPE_DEPNAME} "${CPE_VENDOR},${CPE_NAME},${CPE_VERSION}")
+ set(SBOMCONTENTS
"${SBOMCONTENTS}${CPE_VENDOR},${CPE_NAME},${CPE_VERSION},,,\n")
endif()
endforeach()
configure_file(${CMAKE_SOURCE_DIR}/cmake/cve_check.csv.in
${CMAKE_CURRENT_BINARY_DIR}/cve_check.csv @ONLY)
diff --git a/build_files/build_environment/cmake/download.cmake
b/build_files/build_environment/cmake/download.cmake
index a6fa82bceed..4f8ecc7d0ce 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -32,12 +32,13 @@ function(download_source dep)
message("Checking source : ${dep} (${TARGET_FILE})")
if(NOT EXISTS ${TARGET_FILE})
message("Checking source : ${dep} - source not found downloading from
${TARGET_URI}")
- file(DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
- TIMEOUT 1800 # seconds
- EXPECTED_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
- TLS_VERIFY ON
- SHOW_PROGRESS
- )
+ file(
+ DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
+ TIMEOUT 1800 # seconds
+ EXPECTED_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
+ TLS_VERIFY ON
+ SHOW_PROGRESS
+ )
endif()
if(EXISTS ${TARGET_FILE})
# Sometimes the download fails, but that is not a
diff --git a/build_files/build_environment/cmake/freetype.cmake
b/build_files/build_environment/cmake/freetype.cmake
index c0cb3c3401b..27aace7a115 100644
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -32,9 +32,10 @@ add_dependencies(
if(BUILD_MODE STREQUAL Release AND WIN32)
ExternalProject_Add_Step(external_freetype after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype
${HARVEST_TARGET}/freetype
- # harfbuzz *NEEDS* to find freetype.lib and will not be conviced to
take alternative names so just give it
- # what it wants.
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/freetype/lib/freetype2st.lib
${LIBDIR}/freetype/lib/freetype.lib
+ # harfbuzz *NEEDS* to find freetype.lib and will not be conviced to
take alternative names so just give it
+ # what it wants.
+ COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/freetype/lib/freetype2st.lib ${LIBDIR}/freetype/lib/freetype.lib
+
DEPENDEES install
)
endif()
diff --git a/build_files/build_environment/cmake/gmp.cmake
b/build_files/build_environment/cmake/gmp.cmake
index ddfdba6662d..df4d20fb934 100644
--- a/build_files/build_environment/cmake/gmp.cmake
+++ b/build_files/build_environment/cmake/gmp.cmake
@@ -40,19 +40,21 @@ endif()
if(BUILD_MODE STREQUAL Release AND WIN32)
ExternalProject_Add_Step(external_gmp after_install
- COMMAND ${CMAKE_COMMAND} -E copy
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
- COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
/machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/libgmp-10.dll
${HARVEST_TARGET}/gmp/lib/libgmp-10.dll
- COMMAND ${CMAKE_COMMAND} -E copy
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
${HARVEST_TARGET}/gmp/lib/libgmp-10.lib
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmp/include
${HARVEST_TARGET}/gmp/include
+ COMMAND ${CMAKE_COMMAND} -E copy
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
+ COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
/machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/libgmp-10.dll
${HARVEST_TARGET}/gmp/lib/libgmp-10.dll
+ COMMAND ${CMAKE_COMMAND} -E copy
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
${HARVEST_TARGET}/gmp/lib/libgmp-10.lib
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmp/include
${HARVEST_TARGET}/gmp/include
+
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug AND WIN32)
-ExternalProject_Add_Step(external_gmp after_install
- COMMAND ${CMAKE_COMMAND} -E copy
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
- COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
/machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
+ ExternalProject_Add_Step(external_gmp after_install
+ COMMAND ${CMAKE_COMMAND} -E copy
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def
${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
+ COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
/machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
+
DEPENDEES install
)
endif()
diff --git a/build_files/build_environment/cmake/harvest.cmake
b/build_files/build_environment/cmake/harvest.cmake
index 2660d55d899..60d633c0ca9 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -14,14 +14,14 @@ if(WIN32)
if(BUILD_MODE STREQUAL Release)
add_custom_target(Harvest_Release_Results
COMMAND # jpeg rename libfile + copy include
- ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib
${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
- ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/
${HARVEST_TARGET}/jpeg/include/ &&
- # png
- ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib
${HARVEST_TARGET}/png/lib/libpng.lib &&
- ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/
${HARVEST_TARGET}/png/include/ &&
- # freeglut-> opengl
- ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib
${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
- ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/
${HARVEST_TARGET}/opengl/include/ &&
+ ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib
${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+ ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/
${HARVEST_TARGET}/jpeg/include/ &&
+ # png
+ ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib
${HARVEST_TARGET}/png/lib/libpng.lib &&
+ ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/
${HARVEST_TARGET}/png/include/ &&
+ # freeglut-> opengl
+ ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib
${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+ ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/
${HARVEST_TARGET}/opengl/include/ &&
DEPENDS
)
endif()
diff --git a/build_files/build_environment/cmake/ispc.cmake
b/build_files/build_environment/cmake/ispc.cmake
index c2dbedca55f..c6c41616b84 100644
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -34,21 +34,21 @@ elseif(UNIX)
endif()
set(ISPC_EXTRA_ARGS
- -DISPC_NO_DUMPS=On
- -DISPC_INCLUDE_EXAMPLES=Off
- -DISPC_INCLUDE_TESTS=Off
- -DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
- -DLLVM_LIBRARY_DIR=${LIBDIR}/llvm/lib
- -DCLANG_EXECUTABLE=${LIBDIR}/llvm/bin/clang
- -DCLANGPP_EXECUTABLE=${LIBDIR}/llvm/bin/clang++
- -DISPC_INCLUDE_TESTS=Off
- -DCLANG_LIBRARY_DIR=${LIBDIR}/llvm/lib
- -DCLANG_INCLUDE_DIRS=${LIBDIR}/llvm/include
- -DPython3_ROOT_DIR=${LIBDIR}/python/
- -DPython3_EXECUTABLE=${PYTHON_BINARY}
- ${ISPC_EXTRA_ARGS_WIN}
- ${ISPC_EXTRA_ARGS_APPLE}
- ${ISPC_EXTRA_ARGS_UNIX}
+ -DISPC_NO_DUMPS=On
+ -DISPC_INCLUDE_EXAMPLES=Off
+ -DISPC_INCLUDE_TESTS=Off
+ -DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
+ -DLLVM_LIBRARY_DIR=${LIBDIR}/llvm/lib
+ -DCLANG_EXECUTABLE=${LIBDIR}/llvm/bin/clang
+ -DCLANGPP_EXECUTABLE=${LIBDIR}/llvm/bin/clang++
+ -DISPC_INCLUDE_TESTS=Off
+ -DCLANG_LIBRARY_DIR=${LIBDIR}/llvm/lib
+ -DCLANG_INCLUDE_DIRS=${LIBDIR}/llvm/include
+ -DPython3_ROOT_DIR=${LIBDIR}/python/
+ -DPython3_EXECUTABLE=${PYTHON_BINARY}
+ ${ISPC_EXTRA_ARGS_WIN}
+ ${ISPC_EXTRA_ARGS_APPLE}
+ ${ISPC_EXTRA_ARGS_UNIX}
)
ExternalProject_Add(external_ispc
diff --git a/build_files/build_environment/cmake/opencolorio.cmake
b/build_files/build_environment/cmake/opencolorio.cmake
index 17336c73ddb..20683f718ac 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -105,10 +105,10 @@ if(WIN32)
)
endif()
else()
- ExternalProject_Add_Step(external_opencolorio after_install
- COMMAND cp ${LIBDIR}/yamlcpp/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/
- COMMAND cp ${LIBDIR}/expat/lib/libexpat.a ${LIBDIR}/opencolorio/lib/
- COMMAND cp ${LIBDIR}/pystring/lib/libpystring.a
${LIBDIR}/opencolorio/lib/
- DEPENDEES install
- )
+ ExternalProject_Add_Step(external_opencolorio after_install
+ COMMAND cp ${LIBDIR}/yamlcpp/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/
+ COMMAND cp ${LIBDIR}/expat/lib/libexpat.a ${LIBDIR}/opencolorio/lib/
+ COMMAND cp ${LIBDIR}/pystring/lib/libpystring.a ${LIBDIR}/opencolorio/lib/
+ DEPENDEES install
+ )
endif()
diff --git a/build_files/build_envir
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
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
