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 /extern | |
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 'extern')
-rw-r--r-- | extern/binreloc/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/bullet2/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/ceres/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | extern/ceres/bundle.sh | 2 | ||||
-rw-r--r-- | extern/clew/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/cuew/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/curve_fit_nd/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/draco/dracoenc/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/gflags/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/glew-es/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/glew/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/glog/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/gtest/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/lzma/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/lzo/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/rangetree/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/sdlew/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/wcwidth/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/xdnd/CMakeLists.txt | 5 |
19 files changed, 70 insertions, 19 deletions
diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt index 524b884450c..766939b4228 100644 --- a/extern/binreloc/CMakeLists.txt +++ b/extern/binreloc/CMakeLists.txt @@ -32,7 +32,10 @@ set(SRC include/binreloc.h ) +set(LIB +) + add_definitions(-DENABLE_BINRELOC) -blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 7a19b553fdb..b9c21bd831f 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -407,9 +407,12 @@ set(SRC src/Bullet-C-Api.h ) +set(LIB +) + if(CMAKE_COMPILER_IS_GNUCXX) # needed for gcc 4.6+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") endif() -blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index 3a9ade5510a..0531eb71ba5 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -319,4 +319,4 @@ if(WITH_OPENMP) ) endif() -blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "") diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh index 1c9a2e729e5..e8212aa1d41 100755 --- a/extern/ceres/bundle.sh +++ b/extern/ceres/bundle.sh @@ -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}" "") EOF diff --git a/extern/clew/CMakeLists.txt b/extern/clew/CMakeLists.txt index 940db3d7194..806771cb7f4 100644 --- a/extern/clew/CMakeLists.txt +++ b/extern/clew/CMakeLists.txt @@ -32,6 +32,9 @@ set(SRC src/clew.c ) +set(LIB +) + add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS) -blender_add_lib(extern_clew "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_clew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/cuew/CMakeLists.txt b/extern/cuew/CMakeLists.txt index 1fc5c8f6978..45d10e29799 100644 --- a/extern/cuew/CMakeLists.txt +++ b/extern/cuew/CMakeLists.txt @@ -33,4 +33,7 @@ set(SRC include/cuew.h ) -blender_add_lib(extern_cuew "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(extern_cuew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/curve_fit_nd/CMakeLists.txt b/extern/curve_fit_nd/CMakeLists.txt index cc9efe1c470..f9264f9b890 100644 --- a/extern/curve_fit_nd/CMakeLists.txt +++ b/extern/curve_fit_nd/CMakeLists.txt @@ -36,4 +36,7 @@ set(SRC intern/generic_heap.h ) -blender_add_lib(extern_curve_fit_nd "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(extern_curve_fit_nd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/draco/dracoenc/CMakeLists.txt b/extern/draco/dracoenc/CMakeLists.txt index 8deb21ece83..04f54ab9293 100644 --- a/extern/draco/dracoenc/CMakeLists.txt +++ b/extern/draco/dracoenc/CMakeLists.txt @@ -178,8 +178,11 @@ set(SRC src/draco/point_cloud/point_cloud.h ) +set(LIB +) + set(INC src ) -blender_add_lib(dracoenc "${SRC}" "${INC}" "") +blender_add_lib(dracoenc "${SRC}" "${INC}" "" "${LIB}") diff --git a/extern/gflags/CMakeLists.txt b/extern/gflags/CMakeLists.txt index da24e5504a3..13c3a2a03a9 100644 --- a/extern/gflags/CMakeLists.txt +++ b/extern/gflags/CMakeLists.txt @@ -40,6 +40,9 @@ set(SRC src/util.h ) +set(LIB +) + if(WIN32) list(APPEND SRC src/windows_port.cc @@ -49,4 +52,4 @@ endif() add_definitions(${GFLAGS_DEFINES}) -blender_add_lib(extern_gflags "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_gflags "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/glew-es/CMakeLists.txt b/extern/glew-es/CMakeLists.txt index 8f14855bf4f..5bb46d3f653 100644 --- a/extern/glew-es/CMakeLists.txt +++ b/extern/glew-es/CMakeLists.txt @@ -42,6 +42,9 @@ set(SRC include/GL/wglew.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt index 47d38586d1a..b84b0a30199 100644 --- a/extern/glew/CMakeLists.txt +++ b/extern/glew/CMakeLists.txt @@ -41,6 +41,9 @@ set(SRC include/GL/wglew.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt index 82b415d06d7..1b1abbfc735 100644 --- a/extern/glog/CMakeLists.txt +++ b/extern/glog/CMakeLists.txt @@ -53,6 +53,9 @@ set(SRC src/stacktrace_x86-inl.h ) +set(LIB +) + if(WIN32) list(APPEND SRC src/windows/port.cc @@ -90,4 +93,4 @@ endif() add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) -blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/gtest/CMakeLists.txt b/extern/gtest/CMakeLists.txt index 22b47e76b12..f33e012b0f4 100644 --- a/extern/gtest/CMakeLists.txt +++ b/extern/gtest/CMakeLists.txt @@ -66,4 +66,7 @@ set(SRC include/gtest/internal/gtest-type-util.h ) -blender_add_lib(extern_gtest "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(extern_gtest "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt index d4fe8ade9ba..8be848f83ce 100644 --- a/extern/lzma/CMakeLists.txt +++ b/extern/lzma/CMakeLists.txt @@ -42,4 +42,7 @@ set(SRC Types.h ) -blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt index e4609963d29..7eebc92c46d 100644 --- a/extern/lzo/CMakeLists.txt +++ b/extern/lzo/CMakeLists.txt @@ -36,4 +36,7 @@ set(SRC minilzo/minilzo.h ) -blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/rangetree/CMakeLists.txt b/extern/rangetree/CMakeLists.txt index 77c293e851a..cb0b424a023 100644 --- a/extern/rangetree/CMakeLists.txt +++ b/extern/rangetree/CMakeLists.txt @@ -27,4 +27,7 @@ set(SRC intern/range_tree.c ) -blender_add_lib(extern_rangetree "${SRC}" "${INC}" "") +set(LIB +) + +blender_add_lib(extern_rangetree "${SRC}" "${INC}" "" "${LIB}") diff --git a/extern/sdlew/CMakeLists.txt b/extern/sdlew/CMakeLists.txt index c0cd9944755..5698d87108b 100644 --- a/extern/sdlew/CMakeLists.txt +++ b/extern/sdlew/CMakeLists.txt @@ -32,4 +32,7 @@ set(SRC src/sdlew.c ) -blender_add_lib(extern_sdlew "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(extern_sdlew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/wcwidth/CMakeLists.txt b/extern/wcwidth/CMakeLists.txt index 29a2977c3eb..384a2c4f58c 100644 --- a/extern/wcwidth/CMakeLists.txt +++ b/extern/wcwidth/CMakeLists.txt @@ -32,4 +32,7 @@ set(SRC wcwidth.h ) -blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/xdnd/CMakeLists.txt b/extern/xdnd/CMakeLists.txt index 9a24606d133..54d6648c2a6 100644 --- a/extern/xdnd/CMakeLists.txt +++ b/extern/xdnd/CMakeLists.txt @@ -31,8 +31,11 @@ set(SRC xdnd.h ) +set(LIB +) + add_definitions( -DHAVE_SYS_TIME_H ) -blender_add_lib(extern_xdnd "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_xdnd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |