diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:18:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:37:24 +0300 |
commit | 47adab4f993e66328bd1ad97abaf6697784ee8a0 (patch) | |
tree | 3eb7046a95b0ce3f2ad707764213df372f22abbd /intern | |
parent | eee5a880f186fe9e49bd41a9dc7d6d0bdd371c36 (diff) |
CMake: prepare for BLENDER_SORTED_LIBS removal
No functional change, this adds LIB definition and args to cmake files.
Without this it's difficult to migrate away from 'BLENDER_SORTED_LIBS'
since there are many platforms/configurations that could break when
changing linking order.
Manually add and enable WITHOUT_SORTED_LIBS to try building
without sorted libs (currently fails since all variables are empty).
This check will eventually be removed.
See T46725.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/clog/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/dualcon/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/eigen/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/elbeem/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/ghost/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/glew-mx/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 7 | ||||
-rw-r--r-- | intern/iksolver/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/itasc/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/libmv/CMakeLists.txt | 4 | ||||
-rwxr-xr-x | intern/libmv/bundle.sh | 4 | ||||
-rw-r--r-- | intern/locale/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/memutil/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/mikktspace/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/numaapi/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/opencolorio/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/openvdb/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/rigidbody/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/smoke/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/string/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/utfconv/CMakeLists.txt | 5 |
24 files changed, 93 insertions, 27 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index e359a631532..6b828b204f1 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -38,6 +38,9 @@ endif() intern/AUD_Set.h ) +set(LIB +) + if(WITH_PYTHON) list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS} @@ -49,4 +52,4 @@ if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) endif() -blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/clog/CMakeLists.txt b/intern/clog/CMakeLists.txt index 479723c4cd6..3ca9094dae6 100644 --- a/intern/clog/CMakeLists.txt +++ b/intern/clog/CMakeLists.txt @@ -32,7 +32,10 @@ set(SRC CLG_log.h ) +set(LIB +) + # Disabled for makesdna/makesrna. add_definitions(-DWITH_CLOG_PTHREADS) -blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index f8720de366f..3f8868d793b 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -38,6 +38,9 @@ set(SRC blender_util.h ) +set(LIB +) + set(ADDON_FILES addon/__init__.py addon/engine.py @@ -59,7 +62,7 @@ if(WITH_CYCLES_NETWORK) add_definitions(-DWITH_NETWORK) endif() -blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # avoid link failure with clang 3.4 debug if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4') diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt index bd8c2eff504..a5c1137bc65 100644 --- a/intern/dualcon/CMakeLists.txt +++ b/intern/dualcon/CMakeLists.txt @@ -45,4 +45,7 @@ set(SRC dualcon.h ) -blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/eigen/CMakeLists.txt b/intern/eigen/CMakeLists.txt index 6cdd7e55f0a..650a1aa63c1 100644 --- a/intern/eigen/CMakeLists.txt +++ b/intern/eigen/CMakeLists.txt @@ -40,4 +40,7 @@ set(SRC intern/svd.h ) -blender_add_lib(bf_intern_eigen "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_intern_eigen "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 6a9b307aee4..d70f3939a40 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -85,6 +85,9 @@ set(SRC intern/globals.h ) +set(LIB +) + # elbeem has some harmless UNUSED warnings remove_strict_flags() @@ -116,4 +119,4 @@ else() add_definitions(-DPARALLEL=0) endif() -blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 74d5af9a6c1..eeec5ab1528 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -84,6 +84,9 @@ set(SRC intern/GHOST_WindowManager.h ) +set(LIB +) + if(WITH_GHOST_DEBUG) list(APPEND SRC intern/GHOST_EventPrinter.cpp @@ -337,4 +340,4 @@ endif() add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/glew-mx/CMakeLists.txt b/intern/glew-mx/CMakeLists.txt index c24a741771d..f0b0b2d0ee7 100644 --- a/intern/glew-mx/CMakeLists.txt +++ b/intern/glew-mx/CMakeLists.txt @@ -34,6 +34,9 @@ set(SRC intern/symbol-binding.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_intern_glew_mx "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_glew_mx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 3f07d46529c..72c3395156e 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -40,6 +40,9 @@ set(SRC ../atomic/atomic_ops.h ) +set(LIB +) + if(WIN32 AND NOT UNIX) list(APPEND SRC intern/mmap_win.c @@ -53,12 +56,12 @@ if(WITH_MEM_JEMALLOC AND NOT ("${JEMALLOC_VERSION}" VERSION_LESS "5.0.0")) add_definitions(-DWITH_JEMALLOC_CONF) endif() -blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # Override C++ alloc, optional. if(WITH_CXX_GUARDEDALLOC) set(SRC cpp/mallocn.cpp ) - blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}") + blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") endif() diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 4e9cc7c145b..362e6e2bb6b 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -42,4 +42,7 @@ set(SRC intern/IK_QTask.h ) -blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index db711d7eb2a..c0f48bcf957 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -353,6 +353,9 @@ set(SRC ${EIGEN3_HEADERS} ) +set(LIB +) + unset(EIGEN3_HEADERS) -blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 98edc1492c5..5adfdbea1af 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -192,7 +192,7 @@ if(WITH_LIBMV) if(WITH_GTESTS) - blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "") + blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "" "") BLENDER_SRC_GTEST("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres") BLENDER_SRC_GTEST("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres") @@ -232,4 +232,4 @@ else() ) endif() -blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "") diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index 093095f5f5c..98a1e364634 100755 --- a/intern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -174,7 +174,7 @@ ${third_headers} if(WITH_GTESTS) - blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}") + blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "") ${tests} endif() @@ -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}" "") EOF diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt index b4d142e3efb..31b9e690b29 100644 --- a/intern/locale/CMakeLists.txt +++ b/intern/locale/CMakeLists.txt @@ -31,6 +31,9 @@ set(SRC boost_locale_wrapper.h ) +set(LIB +) + if(APPLE) # Cocoa code to read the locale on OSX list(APPEND SRC @@ -54,4 +57,4 @@ if(WITH_INTERNATIONAL) add_definitions(${BOOST_DEFINITIONS}) endif() -blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index e75443c5003..dc1cf0e0ebf 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -38,4 +38,7 @@ set(SRC MEM_RefCountedC-Api.h ) -blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/mikktspace/CMakeLists.txt b/intern/mikktspace/CMakeLists.txt index f4755916ccc..1dc508a66a4 100644 --- a/intern/mikktspace/CMakeLists.txt +++ b/intern/mikktspace/CMakeLists.txt @@ -39,4 +39,7 @@ set(SRC mikktspace.h ) -blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/numaapi/CMakeLists.txt b/intern/numaapi/CMakeLists.txt index 6d8edb5e1eb..cc4fb27bdb7 100644 --- a/intern/numaapi/CMakeLists.txt +++ b/intern/numaapi/CMakeLists.txt @@ -34,6 +34,9 @@ set(SRC source/build_config.h ) +set(LIB +) + add_definitions(-DWITH_DYNLOAD) -blender_add_lib(bf_intern_numaapi "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_numaapi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt index 8a4423b8e67..48d619d8d71 100644 --- a/intern/opencolorio/CMakeLists.txt +++ b/intern/opencolorio/CMakeLists.txt @@ -38,6 +38,9 @@ set(SRC ocio_impl.h ) +set(LIB +) + if(WITH_OPENCOLORIO) add_definitions( -DWITH_OCIO @@ -69,4 +72,4 @@ if(WITH_OPENCOLORIO) endif() -blender_add_lib(bf_intern_opencolorio "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_opencolorio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 66ed4d174a0..62ecb314a80 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -35,6 +35,9 @@ set(SRC opensubdiv_topology_refiner_capi.h ) +set(LIB +) + if(WITH_OPENSUBDIV) macro(OPENSUBDIV_DEFINE_COMPONENT component) if(${${component}}) @@ -122,4 +125,4 @@ else() ) endif() -blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt index ddec43f30a3..2d72febd3cf 100644 --- a/intern/openvdb/CMakeLists.txt +++ b/intern/openvdb/CMakeLists.txt @@ -30,6 +30,9 @@ set(SRC openvdb_capi.h ) +set(LIB +) + if(WITH_OPENVDB) add_definitions( -DWITH_OPENVDB @@ -69,4 +72,4 @@ if(WITH_OPENVDB) endif() endif() -blender_add_lib(bf_intern_openvdb "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_openvdb "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/rigidbody/CMakeLists.txt b/intern/rigidbody/CMakeLists.txt index 817838a1642..02841c134c0 100644 --- a/intern/rigidbody/CMakeLists.txt +++ b/intern/rigidbody/CMakeLists.txt @@ -32,4 +32,7 @@ set(SRC RBI_api.h ) -blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 0e9c4572bb1..232183fe33c 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -77,6 +77,9 @@ set(SRC intern/tnt/tnt_version.h ) +set(LIB +) + # quiet -Wundef add_definitions(-DDDF_DEBUG=0) @@ -93,4 +96,4 @@ if(WITH_FFTW3) ) endif() -blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index 7a0d45f4cc4..3f436c79a69 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -32,4 +32,7 @@ set(SRC STR_String.h ) -blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/utfconv/CMakeLists.txt b/intern/utfconv/CMakeLists.txt index 118d1710e53..9450461f50b 100644 --- a/intern/utfconv/CMakeLists.txt +++ b/intern/utfconv/CMakeLists.txt @@ -30,6 +30,9 @@ set(SRC utfconv.h ) +set(LIB +) + # This is odd but leave it for now... # Why have win32 check here? - this is only used for windows. # ... because one day we might want to use it on other platforms. @@ -40,4 +43,4 @@ if(WIN32) ) endif() -blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |