Cleanup: cmake indentation, white-space
This commit is contained in:
parent
94cf74afbb
commit
7e850ffa73
|
@ -32,8 +32,8 @@ set(OPENCOLORIO_EXTRA_ARGS
|
||||||
|
|
||||||
if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
|
if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
|
||||||
set(OPENCOLORIO_EXTRA_ARGS
|
set(OPENCOLORIO_EXTRA_ARGS
|
||||||
${OPENCOLORIO_EXTRA_ARGS}
|
${OPENCOLORIO_EXTRA_ARGS}
|
||||||
-DOCIO_USE_SSE=OFF
|
-DOCIO_USE_SSE=OFF
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ else()
|
||||||
set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
|
set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
|
||||||
set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
|
set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
|
||||||
set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
|
set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
|
set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
|
||||||
set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
|
set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
|
||||||
|
|
|
@ -20,7 +20,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
|
||||||
set(SSL_PATCH_CMD echo .)
|
set(SSL_PATCH_CMD echo .)
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
|
set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
|
||||||
else()
|
else()
|
||||||
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
||||||
set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
|
set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
|
||||||
|
|
|
@ -265,7 +265,7 @@ set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar.
|
||||||
set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
|
set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
|
||||||
|
|
||||||
set(FLEXBISON_VERSION 2.5.5)
|
set(FLEXBISON_VERSION 2.5.5)
|
||||||
set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
|
set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-2.5.5.zip)
|
||||||
set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
|
set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
|
||||||
|
|
||||||
# Libraries to keep Python modules static on Linux.
|
# Libraries to keep Python modules static on Linux.
|
||||||
|
@ -309,7 +309,7 @@ set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.
|
||||||
set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
|
set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
|
||||||
|
|
||||||
set(MESA_VERSION 18.3.1)
|
set(MESA_VERSION 18.3.1)
|
||||||
set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
|
set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
|
||||||
set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
|
set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
|
||||||
|
|
||||||
set(NASM_VERSION 2.15.02)
|
set(NASM_VERSION 2.15.02)
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
|
||||||
IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
|
IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
|
||||||
SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
|
SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(_audaspace_SEARCH_DIRS
|
SET(_audaspace_SEARCH_DIRS
|
||||||
|
|
|
@ -59,14 +59,14 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
lib64 lib
|
lib64 lib
|
||||||
)
|
)
|
||||||
IF (NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
|
IF(NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
|
||||||
IF (EMBREE_EMBREE3_LIBRARY)
|
IF(EMBREE_EMBREE3_LIBRARY)
|
||||||
# If we can't find all the static libraries, try to fall back to the shared library if found.
|
# If we can't find all the static libraries, try to fall back to the shared library if found.
|
||||||
# This allows building with a shared embree library
|
# This allows building with a shared embree library
|
||||||
SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY})
|
SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY})
|
||||||
BREAK()
|
BREAK()
|
||||||
ENDIF ()
|
ENDIF()
|
||||||
ENDIF ()
|
ENDIF()
|
||||||
LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
|
LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
|
|
||||||
|
|
|
@ -272,7 +272,7 @@ cmake_policy(SET CMP0057 NEW) # if IN_LIST
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
function(gtest_add_tests)
|
function(gtest_add_tests)
|
||||||
|
|
||||||
if (ARGC LESS 1)
|
if(ARGC LESS 1)
|
||||||
message(FATAL_ERROR "No arguments supplied to gtest_add_tests()")
|
message(FATAL_ERROR "No arguments supplied to gtest_add_tests()")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -298,7 +298,7 @@ function(gtest_add_tests)
|
||||||
set(autoAddSources YES)
|
set(autoAddSources YES)
|
||||||
else()
|
else()
|
||||||
# Non-keyword syntax, convert to keyword form
|
# Non-keyword syntax, convert to keyword form
|
||||||
if (ARGC LESS 3)
|
if(ARGC LESS 3)
|
||||||
message(FATAL_ERROR "gtest_add_tests() without keyword options requires at least 3 arguments")
|
message(FATAL_ERROR "gtest_add_tests() without keyword options requires at least 3 arguments")
|
||||||
endif()
|
endif()
|
||||||
set(ARGS_TARGET "${ARGV0}")
|
set(ARGS_TARGET "${ARGV0}")
|
||||||
|
|
|
@ -389,7 +389,7 @@ function(blender_add_lib
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(blender_add_test_suite)
|
function(blender_add_test_suite)
|
||||||
if (ARGC LESS 1)
|
if(ARGC LESS 1)
|
||||||
message(FATAL_ERROR "No arguments supplied to blender_add_test_suite()")
|
message(FATAL_ERROR "No arguments supplied to blender_add_test_suite()")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -1209,9 +1209,9 @@ function(find_python_package
|
||||||
site-packages
|
site-packages
|
||||||
dist-packages
|
dist-packages
|
||||||
vendor-packages
|
vendor-packages
|
||||||
NO_DEFAULT_PATH
|
NO_DEFAULT_PATH
|
||||||
DOC
|
DOC
|
||||||
"Path to python site-packages or dist-packages containing '${package}' module"
|
"Path to python site-packages or dist-packages containing '${package}' module"
|
||||||
)
|
)
|
||||||
mark_as_advanced(PYTHON_${_upper_package}_PATH)
|
mark_as_advanced(PYTHON_${_upper_package}_PATH)
|
||||||
|
|
||||||
|
|
|
@ -353,7 +353,7 @@ endif()
|
||||||
if(WITH_PUGIXML)
|
if(WITH_PUGIXML)
|
||||||
find_package_wrapper(PugiXML)
|
find_package_wrapper(PugiXML)
|
||||||
|
|
||||||
if (NOT PUGIXML_FOUND)
|
if(NOT PUGIXML_FOUND)
|
||||||
set(WITH_PUGIXML OFF)
|
set(WITH_PUGIXML OFF)
|
||||||
message(STATUS "PugiXML not found, disabling WITH_PUGIXML")
|
message(STATUS "PugiXML not found, disabling WITH_PUGIXML")
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -102,7 +102,7 @@ set(SRC
|
||||||
)
|
)
|
||||||
|
|
||||||
set(LIB
|
set(LIB
|
||||||
${BOOST_LIBRARIES}
|
${BOOST_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
blender_add_lib(extern_quadriflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
blender_add_lib(extern_quadriflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||||
|
|
|
@ -383,7 +383,7 @@ if(WITH_CYCLES_OPENSUBDIV)
|
||||||
optimized ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU.lib
|
optimized ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU.lib
|
||||||
debug ${OPENSUBDIV_ROOT_DIR}/lib/osdCPU_d.lib
|
debug ${OPENSUBDIV_ROOT_DIR}/lib/osdCPU_d.lib
|
||||||
debug ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU_d.lib
|
debug ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU_d.lib
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
project(GhostMultiTest)
|
project(GhostMultiTest)
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../..//build_files/cmake/Modules")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../../build_files/cmake/Modules")
|
||||||
|
|
||||||
set(WITH_GUARDEDALLOC ON)
|
set(WITH_GUARDEDALLOC ON)
|
||||||
|
|
||||||
|
|
|
@ -683,7 +683,7 @@ endif()
|
||||||
|
|
||||||
if(WITH_OPENVDB)
|
if(WITH_OPENVDB)
|
||||||
list(APPEND INC
|
list(APPEND INC
|
||||||
../../../intern/openvdb
|
../../../intern/openvdb
|
||||||
)
|
)
|
||||||
list(APPEND INC_SYS
|
list(APPEND INC_SYS
|
||||||
${OPENVDB_INCLUDE_DIRS}
|
${OPENVDB_INCLUDE_DIRS}
|
||||||
|
@ -697,10 +697,10 @@ endif()
|
||||||
|
|
||||||
if(WITH_QUADRIFLOW)
|
if(WITH_QUADRIFLOW)
|
||||||
list(APPEND INC
|
list(APPEND INC
|
||||||
../../../intern/quadriflow
|
../../../intern/quadriflow
|
||||||
)
|
)
|
||||||
list(APPEND LIB
|
list(APPEND LIB
|
||||||
bf_intern_quadriflow
|
bf_intern_quadriflow
|
||||||
)
|
)
|
||||||
add_definitions(-DWITH_QUADRIFLOW)
|
add_definitions(-DWITH_QUADRIFLOW)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -185,7 +185,7 @@ endif()
|
||||||
|
|
||||||
if(WITH_OPENVDB)
|
if(WITH_OPENVDB)
|
||||||
list(APPEND INC
|
list(APPEND INC
|
||||||
../../../intern/openvdb
|
../../../intern/openvdb
|
||||||
)
|
)
|
||||||
list(APPEND INC_SYS
|
list(APPEND INC_SYS
|
||||||
${OPENVDB_INCLUDE_DIRS}
|
${OPENVDB_INCLUDE_DIRS}
|
||||||
|
|
|
@ -764,7 +764,7 @@ elseif(WIN32)
|
||||||
PATTERN "*.pyo" EXCLUDE # * any cache *
|
PATTERN "*.pyo" EXCLUDE # * any cache *
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
DIRECTORY ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib
|
DIRECTORY ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib
|
||||||
DESTINATION ${BLENDER_VERSION}/python/
|
DESTINATION ${BLENDER_VERSION}/python/
|
||||||
CONFIGURATIONS Debug
|
CONFIGURATIONS Debug
|
||||||
|
@ -772,7 +772,6 @@ elseif(WIN32)
|
||||||
PATTERN "__pycache__" EXCLUDE # * any cache *
|
PATTERN "__pycache__" EXCLUDE # * any cache *
|
||||||
PATTERN "*.pyc" EXCLUDE # * any cache *
|
PATTERN "*.pyc" EXCLUDE # * any cache *
|
||||||
PATTERN "*.pyo" EXCLUDE # * any cache *)
|
PATTERN "*.pyo" EXCLUDE # * any cache *)
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
|
|
@ -72,7 +72,7 @@ elseif(APPLE)
|
||||||
set(_test_libs_dependencies)
|
set(_test_libs_dependencies)
|
||||||
foreach(_lib ${_test_libs})
|
foreach(_lib ${_test_libs})
|
||||||
get_target_property(_interface_libs ${_lib} INTERFACE_LINK_LIBRARIES)
|
get_target_property(_interface_libs ${_lib} INTERFACE_LINK_LIBRARIES)
|
||||||
if (_interface_libs)
|
if(_interface_libs)
|
||||||
list(APPEND _test_libs_dependencies ${_interface_libs})
|
list(APPEND _test_libs_dependencies ${_interface_libs})
|
||||||
endif()
|
endif()
|
||||||
unset(_interface_libs)
|
unset(_interface_libs)
|
||||||
|
|
Loading…
Reference in New Issue