bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: cmake indentation

Browse Source
This commit is contained in:
Campbell Barton 2020-03-04 10:47:24 +11:00
parent d09c5bdc28
commit a5c984a57d
9 changed files with 79 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_files/cmake/macros.cmake
View File

@ -947,7 +947,7 @@ function(data_to_c_simple
set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE) set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
endfunction() endfunction()
# macro for converting pixmap directory to a png and then a c file # Function for converting pixmap directory to a '.png' and then a '.c' file.
function(data_to_c_simple_icons function(data_to_c_simple_icons
path_from icon_prefix icon_names path_from icon_prefix icon_names
list_to_add list_to_add
@ -1160,12 +1160,12 @@ macro(blender_precompile_headers target cpp header)
endmacro() endmacro()
macro(set_and_warn_dependency macro(set_and_warn_dependency
_dependency _setting _val) _dependency _setting _val)
# when $_dependency is disabled, forces $_setting = $_val # when $_dependency is disabled, forces $_setting = $_val
if(NOT ${${_dependency}} AND ${${_setting}}) if(NOT ${${_dependency}} AND ${${_setting}})
message(STATUS "'${_dependency}' is disabled: forcing 'set(${_setting} ${_val})'") message(STATUS "'${_dependency}' is disabled: forcing 'set(${_setting} ${_val})'")
set(${_setting} ${_val}) set(${_setting} ${_val})
endif() endif()
endmacro() endmacro()
macro(without_system_libs_begin) macro(without_system_libs_begin)

10
build_files/cmake/platform/platform_apple.cmake
View File

@ -411,11 +411,13 @@ if(WITH_OPENMP)
# Copy libomp.dylib to allow executables like datatoc and tests to work. # Copy libomp.dylib to allow executables like datatoc and tests to work.
execute_process( execute_process(
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib) COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
)
execute_process( execute_process(
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib) COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
)
endif() endif()
endif() endif()

4
build_files/cmake/platform/platform_win32.cmake
View File

@ -671,8 +671,8 @@ if(WITH_USD)
set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib) set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib/usd) set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib/usd)
set(USD_LIBRARIES set(USD_LIBRARIES
debug ${USD_DEBUG_LIB} debug ${USD_DEBUG_LIB}
optimized ${USD_RELEASE_LIB} optimized ${USD_RELEASE_LIB}
) )
endif() endif()
endif() endif()

18
intern/cycles/app/CMakeLists.txt
View File

@ -51,14 +51,16 @@ endif()
# Common configuration. # Common configuration.
link_directories(${OPENIMAGEIO_LIBPATH} link_directories(
${BOOST_LIBPATH} ${OPENIMAGEIO_LIBPATH}
${PNG_LIBPATH} ${BOOST_LIBPATH}
${JPEG_LIBPATH} ${PNG_LIBPATH}
${ZLIB_LIBPATH} ${JPEG_LIBPATH}
${TIFF_LIBPATH} ${ZLIB_LIBPATH}
${OPENEXR_LIBPATH} ${TIFF_LIBPATH}
${OPENJPEG_LIBPATH}) ${OPENEXR_LIBPATH}
${OPENJPEG_LIBPATH}
)
if(WITH_OPENCOLORIO) if(WITH_OPENCOLORIO)
link_directories(${OPENCOLORIO_LIBPATH}) link_directories(${OPENCOLORIO_LIBPATH})

18
intern/cycles/test/CMakeLists.txt
View File

@ -86,14 +86,16 @@ list(APPEND ALL_CYCLES_LIBRARIES
include_directories(${INC}) include_directories(${INC})
link_directories(${OPENIMAGEIO_LIBPATH} link_directories(
${BOOST_LIBPATH} ${OPENIMAGEIO_LIBPATH}
${PNG_LIBPATH} ${BOOST_LIBPATH}
${JPEG_LIBPATH} ${PNG_LIBPATH}
${ZLIB_LIBPATH} ${JPEG_LIBPATH}
${TIFF_LIBPATH} ${ZLIB_LIBPATH}
${OPENEXR_LIBPATH} ${TIFF_LIBPATH}
${OPENCOLORIO_LIBPATH}) ${OPENEXR_LIBPATH}
${OPENCOLORIO_LIBPATH}
)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}") set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")

2
intern/quadriflow/CMakeLists.txt
View File

@ -40,7 +40,7 @@ set(LIB
) )
if(WIN32) if(WIN32)
add_definitions(-D_USE_MATH_DEFINES) add_definitions(-D_USE_MATH_DEFINES)
endif() endif()
blender_add_lib(bf_intern_quadriflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") blender_add_lib(bf_intern_quadriflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

18
source/blender/collada/CMakeLists.txt
View File

@ -20,16 +20,16 @@
remove_strict_flags() remove_strict_flags()
FIND_FILE(OPENCOLLADA_ANIMATION_CLIP FIND_FILE(OPENCOLLADA_ANIMATION_CLIP
NAMES NAMES
COLLADAFWAnimationClip.h COLLADAFWAnimationClip.h
PATHS PATHS
${OPENCOLLADA_INCLUDE_DIRS} ${OPENCOLLADA_INCLUDE_DIRS}
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
IF(OPENCOLLADA_ANIMATION_CLIP) if(OPENCOLLADA_ANIMATION_CLIP)
add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP) add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP)
ENDIF() endif()
set(INC set(INC
. .

7
source/blender/compositor/CMakeLists.txt
View File

@ -552,8 +552,11 @@ list(APPEND INC
${CMAKE_CURRENT_BINARY_DIR}/operations ${CMAKE_CURRENT_BINARY_DIR}/operations
) )
data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/operations/COM_OpenCLKernels.cl data_to_c(
${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h SRC) ${CMAKE_CURRENT_SOURCE_DIR}/operations/COM_OpenCLKernels.cl
${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h
SRC
)
add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS) add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS)

58
tests/gtests/blenloader/CMakeLists.txt
View File

@ -18,20 +18,20 @@
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
set(INC set(INC
. .
.. ..
../../../source/blender/blenkernel ../../../source/blender/blenkernel
../../../source/blender/blenlib ../../../source/blender/blenlib
../../../source/blender/blenloader ../../../source/blender/blenloader
../../../source/blender/depsgraph ../../../source/blender/depsgraph
../../../source/blender/imbuf ../../../source/blender/imbuf
../../../source/blender/makesdna ../../../source/blender/makesdna
../../../source/blender/makesrna ../../../source/blender/makesrna
../../../source/blender/windowmanager ../../../source/blender/windowmanager
../../../intern/guardedalloc ../../../intern/guardedalloc
${GLOG_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS}
${GFLAGS_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS}
../../../extern/gtest/include ../../../extern/gtest/include
) )
set(SRC set(SRC
@ -46,24 +46,24 @@ blender_add_lib(bf_blenloader_test "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
set(INC set(INC
. .
.. ..
../../../source/blender/blenlib ../../../source/blender/blenlib
../../../source/blender/blenloader ../../../source/blender/blenloader
../../../source/blender/blenkernel ../../../source/blender/blenkernel
../../../source/blender/makesdna ../../../source/blender/makesdna
../../../source/blender/makesrna ../../../source/blender/makesrna
../../../source/blender/depsgraph ../../../source/blender/depsgraph
../../../intern/guardedalloc ../../../intern/guardedalloc
) )
set(LIB set(LIB
bf_blenloader_test bf_blenloader_test
bf_blenloader bf_blenloader
# Should not be needed but gives windows linker errors if the ocio libs are linked before this: # Should not be needed but gives windows linker errors if the ocio libs are linked before this:
bf_intern_opencolorio bf_intern_opencolorio
bf_gpu bf_gpu
) )
include_directories(${INC}) include_directories(${INC})
@ -73,7 +73,7 @@ get_property(BLENDER_SORTED_LIBS GLOBAL PROPERTY BLENDER_SORTED_LIBS_PROP)
set(SRC set(SRC
blendfile_load_test.cc blendfile_load_test.cc
) )
if(WITH_BUILDINFO) if(WITH_BUILDINFO)
list(APPEND SRC list(APPEND SRC