diff options
author | Pablo Dobarro <pablodp606@gmail.com> | 2019-04-23 18:51:51 +0300 |
---|---|---|
committer | Pablo Dobarro <pablodp606@gmail.com> | 2019-04-23 18:53:45 +0300 |
commit | ab0be1b72084010f853060cce4b39bd8de94dfa4 (patch) | |
tree | 2847410a19a0913df81185282058ef1c1372b0a9 /intern/smoke | |
parent | eab72c52429596df978e5af4a9975079c1854848 (diff) | |
parent | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (diff) |
Merge commit 'e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1' into sculpt-mode-features
Diffstat (limited to 'intern/smoke')
-rw-r--r-- | intern/smoke/CMakeLists.txt | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 232183fe33c..5c8e495fa93 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -19,62 +19,62 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - intern - ../memutil + intern + ../memutil ) set(INC_SYS - ${BULLET_INCLUDE_DIRS} - ${PNG_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} + ${BULLET_INCLUDE_DIRS} + ${PNG_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} ) set(SRC - intern/EIGENVALUE_HELPER.cpp - intern/FLUID_3D.cpp - intern/FLUID_3D_SOLVERS.cpp - intern/FLUID_3D_STATIC.cpp - intern/LU_HELPER.cpp - intern/SPHERE.cpp - intern/WTURBULENCE.cpp - intern/smoke_API.cpp + intern/EIGENVALUE_HELPER.cpp + intern/FLUID_3D.cpp + intern/FLUID_3D_SOLVERS.cpp + intern/FLUID_3D_STATIC.cpp + intern/LU_HELPER.cpp + intern/SPHERE.cpp + intern/WTURBULENCE.cpp + intern/smoke_API.cpp - extern/smoke_API.h - intern/EIGENVALUE_HELPER.h - intern/FFT_NOISE.h - intern/FLUID_3D.h - intern/IMAGE.h - intern/INTERPOLATE.h - intern/LU_HELPER.h - intern/MERSENNETWISTER.h - intern/OBSTACLE.h - intern/SPHERE.h - intern/VEC3.h - intern/WAVELET_NOISE.h - intern/WTURBULENCE.h - intern/tnt/jama_eig.h - intern/tnt/jama_lu.h - intern/tnt/tnt.h - intern/tnt/tnt_array1d.h - intern/tnt/tnt_array1d_utils.h - intern/tnt/tnt_array2d.h - intern/tnt/tnt_array2d_utils.h - intern/tnt/tnt_array3d.h - intern/tnt/tnt_array3d_utils.h - intern/tnt/tnt_cmat.h - intern/tnt/tnt_fortran_array1d.h - intern/tnt/tnt_fortran_array1d_utils.h - intern/tnt/tnt_fortran_array2d.h - intern/tnt/tnt_fortran_array2d_utils.h - intern/tnt/tnt_fortran_array3d.h - intern/tnt/tnt_fortran_array3d_utils.h - intern/tnt/tnt_i_refvec.h - intern/tnt/tnt_math_utils.h - intern/tnt/tnt_sparse_matrix_csr.h - intern/tnt/tnt_stopwatch.h - intern/tnt/tnt_subscript.h - intern/tnt/tnt_vec.h - intern/tnt/tnt_version.h + extern/smoke_API.h + intern/EIGENVALUE_HELPER.h + intern/FFT_NOISE.h + intern/FLUID_3D.h + intern/IMAGE.h + intern/INTERPOLATE.h + intern/LU_HELPER.h + intern/MERSENNETWISTER.h + intern/OBSTACLE.h + intern/SPHERE.h + intern/VEC3.h + intern/WAVELET_NOISE.h + intern/WTURBULENCE.h + intern/tnt/jama_eig.h + intern/tnt/jama_lu.h + intern/tnt/tnt.h + intern/tnt/tnt_array1d.h + intern/tnt/tnt_array1d_utils.h + intern/tnt/tnt_array2d.h + intern/tnt/tnt_array2d_utils.h + intern/tnt/tnt_array3d.h + intern/tnt/tnt_array3d_utils.h + intern/tnt/tnt_cmat.h + intern/tnt/tnt_fortran_array1d.h + intern/tnt/tnt_fortran_array1d_utils.h + intern/tnt/tnt_fortran_array2d.h + intern/tnt/tnt_fortran_array2d_utils.h + intern/tnt/tnt_fortran_array3d.h + intern/tnt/tnt_fortran_array3d_utils.h + intern/tnt/tnt_i_refvec.h + intern/tnt/tnt_math_utils.h + intern/tnt/tnt_sparse_matrix_csr.h + intern/tnt/tnt_stopwatch.h + intern/tnt/tnt_subscript.h + intern/tnt/tnt_vec.h + intern/tnt/tnt_version.h ) set(LIB @@ -84,16 +84,16 @@ set(LIB add_definitions(-DDDF_DEBUG=0) if(WITH_OPENMP) - add_definitions(-DPARALLEL=1) + add_definitions(-DPARALLEL=1) else() - add_definitions(-DPARALLEL=0) + add_definitions(-DPARALLEL=0) endif() if(WITH_FFTW3) - add_definitions(-DWITH_FFTW3) - list(APPEND INC_SYS - ${FFTW3_INCLUDE_DIRS} - ) + add_definitions(-DWITH_FFTW3) + list(APPEND INC_SYS + ${FFTW3_INCLUDE_DIRS} + ) endif() blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |