kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: use BULLET_LIBRARIES for both extern_bullet and system libraries

Browse Source 
There was no need to differentiate between these and it made
the CMake files more verbose.
This commit is contained in:
Campbell Barton 2023-01-19 17:07:21 +11:00
parent 978a7459f1
commit 8b7d2d8eb2
7 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -1262,12 +1262,14 @@ endif()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Configure Bullet # Configure Bullet
if(WITH_BULLET AND WITH_SYSTEM_BULLET) if(WITH_BULLET)
find_package(Bullet) if(WITH_SYSTEM_BULLET)
set_and_warn_library_found("Bullet" BULLET_FOUND WITH_BULLET) find_package(Bullet)
else() set_and_warn_library_found("Bullet" BULLET_FOUND WITH_BULLET)
set(BULLET_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/bullet2/src") else()
# set(BULLET_LIBRARIES "") set(BULLET_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/bullet2/src")
set(BULLET_LIBRARIES "extern_bullet")
endif()
endif() endif()

1
intern/rigidbody/CMakeLists.txt
View File

@ -20,7 +20,6 @@ set(SRC
) )
set(LIB set(LIB
extern_bullet
${BULLET_LIBRARIES} ${BULLET_LIBRARIES}
) )

7
source/blender/blenkernel/CMakeLists.txt
View File

@ -577,13 +577,6 @@ if(WITH_BULLET)
list(APPEND INC list(APPEND INC
../../../intern/rigidbody ../../../intern/rigidbody
) )
if(NOT WITH_SYSTEM_BULLET)
list(APPEND LIB
extern_bullet
)
endif()
list(APPEND LIB list(APPEND LIB
bf_intern_rigidbody bf_intern_rigidbody

6
source/blender/bmesh/CMakeLists.txt
View File

@ -179,12 +179,6 @@ if(WITH_BULLET)
${BULLET_INCLUDE_DIRS} ${BULLET_INCLUDE_DIRS}
../../../intern/rigidbody ../../../intern/rigidbody
) )
if(NOT WITH_SYSTEM_BULLET)
list(APPEND LIB
extern_bullet
)
endif()
list(APPEND LIB list(APPEND LIB
${BULLET_LIBRARIES} ${BULLET_LIBRARIES}
) )

8
source/blender/modifiers/CMakeLists.txt
View File

@ -158,11 +158,9 @@ if(WITH_OPENSUBDIV)
endif() endif()
if(WITH_BULLET) if(WITH_BULLET)
if(NOT WITH_SYSTEM_BULLET) list(APPEND LIB
list(APPEND LIB ${BULLET_LIBRARIES}
extern_bullet )
)
endif()
add_definitions(-DWITH_BULLET) add_definitions(-DWITH_BULLET)
endif() endif()

6
source/blender/nodes/CMakeLists.txt
View File

@ -92,12 +92,6 @@ if(WITH_BULLET)
${BULLET_INCLUDE_DIRS} ${BULLET_INCLUDE_DIRS}
../../../intern/rigidbody ../../../intern/rigidbody
) )
if(NOT WITH_SYSTEM_BULLET)
list(APPEND LIB
extern_bullet
)
endif()
list(APPEND LIB list(APPEND LIB
${BULLET_LIBRARIES} ${BULLET_LIBRARIES}
) )

6
source/blender/nodes/geometry/CMakeLists.txt
View File

@ -196,12 +196,6 @@ if(WITH_BULLET)
${BULLET_INCLUDE_DIRS} ${BULLET_INCLUDE_DIRS}
../../../../intern/rigidbody ../../../../intern/rigidbody
) )
if(NOT WITH_SYSTEM_BULLET)
list(APPEND LIB
extern_bullet
)
endif()
list(APPEND LIB list(APPEND LIB
${BULLET_LIBRARIES} ${BULLET_LIBRARIES}
) )