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

2
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

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

@ -412,10 +412,12 @@ 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()

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

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

6
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(
${OPENIMAGEIO_LIBPATH}
${BOOST_LIBPATH} ${BOOST_LIBPATH}
${PNG_LIBPATH} ${PNG_LIBPATH}
${JPEG_LIBPATH} ${JPEG_LIBPATH}
${ZLIB_LIBPATH} ${ZLIB_LIBPATH}
${TIFF_LIBPATH} ${TIFF_LIBPATH}
${OPENEXR_LIBPATH} ${OPENEXR_LIBPATH}
${OPENCOLORIO_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}")

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

@ -25,11 +25,11 @@ FIND_FILE(OPENCOLLADA_ANIMATION_CLIP
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)