CMake: cleanup, arg rename, add definitions last
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Apr 2019 04:11:27 +0000 (06:11 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Apr 2019 04:15:18 +0000 (06:15 +0200)
25 files changed:
build_files/cmake/macros.cmake
extern/ceres/CMakeLists.txt
extern/ceres/bundle.sh
intern/cycles/bvh/CMakeLists.txt
intern/cycles/cmake/macros.cmake
intern/cycles/device/CMakeLists.txt
intern/cycles/graph/CMakeLists.txt
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/osl/CMakeLists.txt
intern/cycles/render/CMakeLists.txt
intern/cycles/subd/CMakeLists.txt
intern/cycles/util/CMakeLists.txt
intern/libmv/CMakeLists.txt
intern/libmv/bundle.sh
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/smoke.c
source/blender/bmesh/CMakeLists.txt
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/physics_fluid.c
source/blender/editors/sound/CMakeLists.txt
source/blender/editors/space_graph/CMakeLists.txt
source/blender/ikplugin/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/creator/CMakeLists.txt

index c034042..0da4a4a 100644 (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()
index 0531eb7..fad0734 100644 (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}")
index e8212aa..b084eb4 100755 (executable)
@@ -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
index 6014624..52f4138 100644 (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})
index f3ca06a..ed4c0e4 100644 (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()
index d95cd02..f0f0390 100644 (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})
index 0ce56c2..bd2b272 100644 (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})
index 822ce68..cbb6996 100644 (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}
index adca45c..804610b 100644 (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})
index b7c53f1..af0f8b8 100644 (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})
index 7f952dd..9669bde 100644 (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})
index 16abed1..b8b38a5 100644 (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})
index 5adfdbe..91e638c 100644 (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}")
index 98a1e36..27fc0e8 100755 (executable)
@@ -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
index 8e6a912..390ac51 100644 (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(
index 82acc27..122bb5a 100644 (file)
 #  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"
index be6c819..6e228bb 100644 (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)
index 1b42c3f..25b76f5 100644 (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()
 
index 9192d1c..d3b57a0 100644 (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"
index 41650f0..a7d128a 100644 (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)
index 53c228c..391d0df 100644 (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)
index 9bbc3a6..e741bf9 100644 (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}")
index 87002e5..5c16e0d 100644 (file)
@@ -101,7 +101,6 @@ if(WITH_IMAGE_TIFF)
        list(APPEND SRC
                intern/tiff.c
        )
-
        add_definitions(-DWITH_TIFF)
 endif()
 
index 4873e08..8cf6382 100644 (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)
index 1455560..5111e2b 100644 (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