diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-11-24 22:42:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-10 03:58:10 +0300 |
| commit | f9047c3f8c72f1a15a4c051b507306d308f44646 (patch) | |
| tree | 5116007ad245bbbc95695f13afa7134983e42be4 /build_files/cmake | |
| parent | 858b680a50888a071d5d37af261b0c89b47aea8c (diff) | |
Eigen: fold remaining OpenNL code into intern/eigen.
Differential Revision: https://developer.blender.org/D1662
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/cmake_static_check_clang_array.py | 1 | ||||
| -rw-r--r-- | build_files/cmake/cmake_static_check_cppcheck.py | 1 | ||||
| -rw-r--r-- | build_files/cmake/cmake_static_check_smatch.py | 1 | ||||
| -rw-r--r-- | build_files/cmake/cmake_static_check_sparse.py | 1 | ||||
| -rw-r--r-- | build_files/cmake/cmake_static_check_splint.py | 1 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 1 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 1 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 5 |
8 files changed, 0 insertions, 12 deletions
diff --git a/build_files/cmake/cmake_static_check_clang_array.py b/build_files/cmake/cmake_static_check_clang_array.py index 45b262a13ce..597d1d2b980 100644 --- a/build_files/cmake/cmake_static_check_clang_array.py +++ b/build_files/cmake/cmake_static_check_clang_array.py @@ -32,7 +32,6 @@ USE_QUIET = (os.environ.get("QUIET", None) is not None) CHECKER_IGNORE_PREFIX = [ "extern", "intern/moto", - "blender/intern/opennl", ] CHECKER_BIN = "python2" diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py index 9f012cb7f6d..3504b005adc 100644 --- a/build_files/cmake/cmake_static_check_cppcheck.py +++ b/build_files/cmake/cmake_static_check_cppcheck.py @@ -32,7 +32,6 @@ USE_QUIET = (os.environ.get("QUIET", None) is not None) CHECKER_IGNORE_PREFIX = [ "extern", "intern/moto", - "blender/intern/opennl", ] CHECKER_BIN = "cppcheck" diff --git a/build_files/cmake/cmake_static_check_smatch.py b/build_files/cmake/cmake_static_check_smatch.py index de13d141276..f525187e22c 100644 --- a/build_files/cmake/cmake_static_check_smatch.py +++ b/build_files/cmake/cmake_static_check_smatch.py @@ -25,7 +25,6 @@ CHECKER_IGNORE_PREFIX = [ "extern", "intern/moto", - "blender/intern/opennl", ] CHECKER_BIN = "smatch" diff --git a/build_files/cmake/cmake_static_check_sparse.py b/build_files/cmake/cmake_static_check_sparse.py index 2ee99925adb..6d1c4e3d6a2 100644 --- a/build_files/cmake/cmake_static_check_sparse.py +++ b/build_files/cmake/cmake_static_check_sparse.py @@ -25,7 +25,6 @@ CHECKER_IGNORE_PREFIX = [ "extern", "intern/moto", - "blender/intern/opennl", ] CHECKER_BIN = "sparse" diff --git a/build_files/cmake/cmake_static_check_splint.py b/build_files/cmake/cmake_static_check_splint.py index 5a967ecc7a3..46d8808e89d 100644 --- a/build_files/cmake/cmake_static_check_splint.py +++ b/build_files/cmake/cmake_static_check_splint.py @@ -25,7 +25,6 @@ CHECKER_IGNORE_PREFIX = [ "extern", "intern/moto", - "blender/intern/opennl", ] CHECKER_BIN = "splint" diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 0ca980050db..ad8a6815675 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -43,7 +43,6 @@ set(WITH_OPENAL ON CACHE BOOL "" FORCE) set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE) set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE) set(WITH_OPENMP ON CACHE BOOL "" FORCE) -set(WITH_OPENNL ON CACHE BOOL "" FORCE) set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) set(WITH_RAYOPTIMIZATION ON CACHE BOOL "" FORCE) set(WITH_SDL ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 9e7b4dcf39b..99e90caf793 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -47,7 +47,6 @@ set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE) set(WITH_OPENCOLORIO OFF CACHE BOOL "" FORCE) set(WITH_OPENIMAGEIO OFF CACHE BOOL "" FORCE) set(WITH_OPENMP OFF CACHE BOOL "" FORCE) -set(WITH_OPENNL OFF CACHE BOOL "" FORCE) set(WITH_RAYOPTIMIZATION OFF CACHE BOOL "" FORCE) set(WITH_SDL OFF CACHE BOOL "" FORCE) set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 39c12f2c4d9..4ba15c72677 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -596,7 +596,6 @@ function(SETUP_BLENDER_SORTED_LIBS) ge_phys_bullet bf_intern_smoke extern_lzma - extern_colamd ge_logic_ketsji extern_recastnavigation ge_logic @@ -698,10 +697,6 @@ function(SETUP_BLENDER_SORTED_LIBS) list(APPEND BLENDER_SORTED_LIBS bf_intern_locale) endif() - if(WITH_OPENNL) - list_insert_after(BLENDER_SORTED_LIBS "bf_render" "bf_intern_opennl") - endif() - if(WITH_BULLET) list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody") endif() |