tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

CMake: cleanup, arg rename, add definitions last

This commit is contained in:
Campbell Barton 2019-04-16 06:11:27 +02:00
parent bb6b7dd4ad
commit 813e470eac
25 changed files with 98 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_files/cmake/macros.cmake
View File

@ -222,7 +222,7 @@ function(blender_add_lib__impl
sources
includes
includes_sys
libraries
library_deps
)
# message(STATUS "Configuring library ${name}")
@ -236,8 +236,8 @@ function(blender_add_lib__impl
# Use for testing 'BLENDER_SORTED_LIBS' removal.
if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)
if (NOT "${libraries}" STREQUAL "")
target_link_libraries(${name} "${libraries}")
if (NOT "${library_deps}" STREQUAL "")
target_link_libraries(${name} "${library_deps}")
endif()
endif()
@ -265,12 +265,12 @@ function(blender_add_lib_nolist
sources
includes
includes_sys
libraries
library_deps
)
add_cc_flags_custom_test(${name} PARENT_SCOPE)
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}")
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
endfunction()
function(blender_add_lib
@ -278,12 +278,12 @@ function(blender_add_lib
sources
includes
includes_sys
libraries
library_deps
)
add_cc_flags_custom_test(${name} PARENT_SCOPE)
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}")
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
endfunction()

6
extern/ceres/CMakeLists.txt vendored
View File

@ -256,6 +256,10 @@ set(SRC
internal/ceres/wall_time.h
)
set(LIB
)
if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
list(APPEND SRC
internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
@ -319,4 +323,4 @@ if(WITH_OPENMP)
)
endif()
blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "")
blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

10
extern/ceres/bundle.sh vendored
View File

@ -109,10 +109,6 @@ cat > CMakeLists.txt << EOF
#
# The Original Code is Copyright (C) 2012, Blender Foundation
# All rights reserved.
#
# Contributor(s): Blender Foundation,
# Sergey Sharybin
#
# ***** END GPL LICENSE BLOCK *****
# NOTE: This file is automatically generated by bundle.sh script
@ -139,6 +135,10 @@ ${sources}
${headers}
)
set(LIB
)
if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
list(APPEND SRC
${generated_sources}
@ -165,5 +165,5 @@ if(WITH_OPENMP)
)
endif()
blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "")
blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
EOF

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

@ -35,7 +35,11 @@ set(SRC_HEADERS
bvh_unaligned.h
)
set(LIB
)
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
cycles_add_library(cycles_bvh ${SRC} ${SRC_HEADERS})
cycles_add_library(cycles_bvh "${LIB}" ${SRC} ${SRC_HEADERS})

7
intern/cycles/cmake/macros.cmake
View File

@ -6,7 +6,12 @@ function(cycles_set_solution_folder target)
endif()
endfunction()
macro(cycles_add_library target)
macro(cycles_add_library target library_deps)
add_library(${target} ${ARGN})
if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)
if(NOT ("${library_deps}" STREQUAL ""))
target_link_libraries(${target} "${library_deps}")
endif()
endif()
cycles_set_solution_folder(${target})
endmacro()

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

@ -58,6 +58,10 @@ set(SRC_HEADERS
device_task.h
)
set(LIB
)
add_definitions(${GL_DEFINITIONS})
if(WITH_CYCLES_NETWORK)
add_definitions(-DWITH_NETWORK)
@ -75,4 +79,4 @@ endif()
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
cycles_add_library(cycles_device ${SRC} ${SRC_OPENCL} ${SRC_HEADERS})
cycles_add_library(cycles_device "${LIB}" ${SRC} ${SRC_OPENCL} ${SRC_HEADERS})

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

@ -16,7 +16,11 @@ set(SRC_HEADERS
node_xml.h
)
set(LIB
)
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
cycles_add_library(cycles_graph ${SRC} ${SRC_HEADERS})
cycles_add_library(cycles_graph "${LIB}" ${SRC} ${SRC_HEADERS})

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

@ -333,6 +333,10 @@ set(SRC_SPLIT_HEADERS
split/kernel_subsurface_scatter.h
)
set(LIB
)
# CUDA module
if(WITH_CYCLES_CUDA_BINARIES)
@ -507,7 +511,7 @@ if(CXX_HAS_AVX2)
set_source_files_properties(kernels/cpu/filter_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}")
endif()
cycles_add_library(cycles_kernel
cycles_add_library(cycles_kernel "${LIB}"
${SRC_CPU_KERNELS}
${SRC_CUDA_KERNELS}
${SRC_OPENCL_KERNELS}

6
intern/cycles/kernel/osl/CMakeLists.txt
View File

@ -25,9 +25,13 @@ set(HEADER_SRC
osl_shader.h
)
set(LIB
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
cycles_add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
cycles_add_library(cycles_kernel_osl "${LIB}" ${SRC} ${HEADER_SRC})

5
intern/cycles/render/CMakeLists.txt
View File

@ -73,6 +73,9 @@ set(SRC_HEADERS
tile.h
)
set(LIB
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
include_directories(${INC})
@ -80,4 +83,4 @@ include_directories(SYSTEM ${INC_SYS})
add_definitions(${GL_DEFINITIONS})
cycles_add_library(cycles_render ${SRC} ${SRC_HEADERS})
cycles_add_library(cycles_render "${LIB}" ${SRC} ${SRC_HEADERS})

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

@ -21,7 +21,11 @@ set(SRC_HEADERS
subd_split.h
)
set(LIB
)
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
cycles_add_library(cycles_subd ${SRC} ${SRC_HEADERS})
cycles_add_library(cycles_subd "${LIB}" ${SRC} ${SRC_HEADERS})

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

@ -27,6 +27,10 @@ set(SRC
util_transform.cpp
)
set(LIB
)
if(WITH_CYCLES_STANDALONE)
if (WITH_CYCLES_STANDALONE_GUI)
list(APPEND SRC
@ -146,4 +150,4 @@ include_directories(SYSTEM ${INC_SYS})
add_definitions(${GL_DEFINITIONS})
cycles_add_library(cycles_util ${SRC} ${SRC_HEADERS})
cycles_add_library(cycles_util "${LIB}" ${SRC} ${SRC_HEADERS})

6
intern/libmv/CMakeLists.txt
View File

@ -33,6 +33,10 @@ set(SRC
libmv-capi.h
)
set(LIB
)
if(WITH_LIBMV)
add_definitions(${GFLAGS_DEFINES})
add_definitions(${GLOG_DEFINES})
@ -232,4 +236,4 @@ else()
)
endif()
blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "")
blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

10
intern/libmv/bundle.sh
View File

@ -95,10 +95,6 @@ cat > CMakeLists.txt << EOF
#
# The Original Code is Copyright (C) 2011, Blender Foundation
# All rights reserved.
#
# Contributor(s): Blender Foundation,
# Sergey Sharybin
#
# ***** END GPL LICENSE BLOCK *****
# NOTE: This file is automatically generated by bundle.sh script
@ -116,6 +112,10 @@ set(SRC
libmv-capi.h
)
set(LIB
)
if(WITH_LIBMV)
add_definitions(\${GFLAGS_DEFINES})
add_definitions(\${GLOG_DEFINES})
@ -184,5 +184,5 @@ else()
)
endif()
blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "")
blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
EOF

8
source/blender/blenkernel/CMakeLists.txt
View File

@ -44,7 +44,6 @@ set(INC
../../../intern/iksolver/extern
../../../intern/memutil
../../../intern/mikktspace
../../../intern/smoke/extern
../../../intern/atomic
../../../intern/clog
../../../intern/libmv
@ -486,6 +485,9 @@ if(WITH_MOD_FLUID)
endif()
if(WITH_MOD_SMOKE)
list(APPEND INC
../../../intern/smoke/extern
)
add_definitions(-DWITH_SMOKE)
endif()
@ -545,17 +547,17 @@ if(WITH_ALEMBIC)
endif()
if(WITH_OPENSUBDIV)
add_definitions(-DWITH_OPENSUBDIV)
list(APPEND INC_SYS
${OPENSUBDIV_INCLUDE_DIRS}
)
add_definitions(-DWITH_OPENSUBDIV)
endif()
if(WITH_OPENVDB)
add_definitions(-DWITH_OPENVDB)
list(APPEND INC
../../../intern/openvdb
)
add_definitions(-DWITH_OPENVDB)
if(WITH_OPENVDB_BLOSC)
add_definitions(

4
source/blender/blenkernel/intern/smoke.c
View File

@ -87,10 +87,10 @@
# include "PIL_time.h"
#endif
#include "smoke_API.h"
#ifdef WITH_SMOKE
#include "smoke_API.h"
#include "BLI_task.h"
#include "BLI_kdtree.h"
#include "BLI_voxel.h"

2
source/blender/bmesh/CMakeLists.txt
View File

@ -171,10 +171,10 @@ if(MSVC AND NOT MSVC_CLANG)
endif()
if(WITH_BULLET)
add_definitions(-DWITH_BULLET)
list(APPEND INC_SYS
${BULLET_INCLUDE_DIRS}
)
add_definitions(-DWITH_BULLET)
endif()
if(WITH_INTERNATIONAL)

4
source/blender/editors/physics/CMakeLists.txt
View File

@ -25,7 +25,6 @@ set(INC
../../makesdna
../../makesrna
../../windowmanager
../../../../intern/elbeem/extern
../../../../intern/guardedalloc
../../../../intern/glew-mx
)
@ -55,6 +54,9 @@ set(LIB
)
if(WITH_MOD_FLUID)
list(APPEND INC
../../../../intern/elbeem/extern
)
add_definitions(-DWITH_MOD_FLUID)
endif()

4
source/blender/editors/physics/physics_fluid.c
View File

@ -45,8 +45,6 @@
#include "DEG_depsgraph.h"
#include "LBM_fluidsim.h"
#include "ED_screen.h"
#include "WM_types.h"
@ -57,6 +55,8 @@
/* enable/disable overall compilation */
#ifdef WITH_MOD_FLUID
#include "LBM_fluidsim.h"
#include "BLI_blenlib.h"
#include "BLI_path_util.h"
#include "BLI_math.h"

3
source/blender/editors/sound/CMakeLists.txt
View File

@ -39,11 +39,10 @@ set(LIB
)
if(WITH_AUDASPACE)
add_definitions(-DWITH_AUDASPACE)
list(APPEND INC_SYS
${AUDASPACE_C_INCLUDE_DIRS}
)
add_definitions(-DWITH_AUDASPACE)
endif()
if(WITH_CODEC_FFMPEG)

3
source/blender/editors/space_graph/CMakeLists.txt
View File

@ -49,11 +49,10 @@ set(LIB
)
if(WITH_AUDASPACE)
add_definitions(-DWITH_AUDASPACE)
list(APPEND INC_SYS
${AUDASPACE_C_INCLUDE_DIRS}
)
add_definitions(-DWITH_AUDASPACE)
endif()
if(WITH_INTERNATIONAL)

4
source/blender/ikplugin/CMakeLists.txt
View File

@ -43,7 +43,6 @@ set(LIB
)
if(WITH_IK_SOLVER)
add_definitions(-DWITH_IK_SOLVER)
list(APPEND INC
../../../intern/iksolver/extern
)
@ -51,10 +50,10 @@ if(WITH_IK_SOLVER)
intern/iksolver_plugin.c
intern/iksolver_plugin.h
)
add_definitions(-DWITH_IK_SOLVER)
endif()
if(WITH_IK_ITASC)
add_definitions(-DWITH_IK_ITASC)
list(APPEND INC
../../../intern/itasc
)
@ -65,6 +64,7 @@ if(WITH_IK_ITASC)
intern/itasc_plugin.cpp
intern/itasc_plugin.h
)
add_definitions(-DWITH_IK_ITASC)
endif()
blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

1
source/blender/imbuf/CMakeLists.txt
View File

@ -101,7 +101,6 @@ if(WITH_IMAGE_TIFF)
list(APPEND SRC
intern/tiff.c
)
add_definitions(-DWITH_TIFF)
endif()

2
source/blender/modifiers/CMakeLists.txt
View File

@ -119,10 +119,10 @@ if(WITH_ALEMBIC)
endif()
if(WITH_MOD_REMESH)
add_definitions(-DWITH_MOD_REMESH)
list(APPEND INC
../../../intern/dualcon
)
add_definitions(-DWITH_MOD_REMESH)
endif()
if(WITH_MOD_FLUID)

14
source/creator/CMakeLists.txt
View File

@ -52,9 +52,11 @@ if(WITH_LIBMV)
add_definitions(-DWITH_LIBMV)
endif()
if(WITH_CYCLES AND WITH_CYCLES_LOGGING)
blender_include_dirs(../../intern/cycles/blender)
add_definitions(-DWITH_CYCLES_LOGGING)
if(WITH_CYCLES)
if(WITH_CYCLES_LOGGING)
blender_include_dirs(../../intern/cycles/blender)
add_definitions(-DWITH_CYCLES_LOGGING)
endif()
endif()
if(WITH_CODEC_FFMPEG)
@ -76,20 +78,20 @@ endif()
if(WITH_SDL)
if(WITH_SDL_DYNLOAD)
add_definitions(-DWITH_SDL_DYNLOAD)
blender_include_dirs(../../extern/sdlew/include)
add_definitions(-DWITH_SDL_DYNLOAD)
endif()
add_definitions(-DWITH_SDL)
endif()
if(WITH_BINRELOC)
add_definitions(-DWITH_BINRELOC)
blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
add_definitions(-DWITH_BINRELOC)
endif()
if(WITH_FREESTYLE)
add_definitions(-DWITH_FREESTYLE)
blender_include_dirs(../blender/freestyle)
add_definitions(-DWITH_FREESTYLE)
endif()
# Setup the exe sources and buildinfo