1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From: Markus Koschany <apo@debian.org>
Date: Fri, 16 Oct 2020 00:53:28 +0200
Subject: 0004-CMake-definitions-use-the-namespaced-library-names
---
BulletConfig.cmake.in | 2 +-
CMakeLists.txt | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
Index: bullet/BulletConfig.cmake.in
===================================================================
--- bullet.orig/BulletConfig.cmake.in
+++ bullet/BulletConfig.cmake.in
@@ -16,7 +16,7 @@
set ( BULLET_FOUND 1 )
set ( BULLET_USE_FILE "@BULLET_USE_FILE@" )
-set ( BULLET_DEFINITIONS "@BULLET_DEFINITIONS@" )
+set ( BULLET_DEFINITIONS "@BULLET_DOUBLE_DEF@" )
set ( BULLET_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" )
set ( BULLET_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" )
set ( BULLET_LIBRARIES "@BULLET_LIBRARIES@" )
Index: bullet/CMakeLists.txt
===================================================================
--- bullet.orig/CMakeLists.txt
+++ bullet/CMakeLists.txt
@@ -567,23 +567,22 @@ IF (BUILD_UNIT_TESTS)
ENDIF()
set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
-list (APPEND BULLET_DEFINITIONS ${BULLET_DOUBLE_DEF})
-list (APPEND BULLET_LIBRARIES LinearMath)
-list (APPEND BULLET_LIBRARIES Bullet3Common)
-list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
-list (APPEND BULLET_LIBRARIES BulletCollision)
-list (APPEND BULLET_LIBRARIES BulletDynamics)
-list (APPEND BULLET_LIBRARIES BulletSoftBody)
+list (APPEND BULLET_LIBRARIES LinearMath${lib_type_suffix})
+list (APPEND BULLET_LIBRARIES Bullet3Common${lib_type_suffix})
+list (APPEND BULLET_LIBRARIES BulletInverseDynamics${lib_type_suffix})
+list (APPEND BULLET_LIBRARIES BulletCollision${lib_type_suffix})
+list (APPEND BULLET_LIBRARIES BulletDynamics${lib_type_suffix})
+list (APPEND BULLET_LIBRARIES BulletSoftBody${lib_type_suffix})
set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake)
configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig${lib_type_suffix}.cmake
@ONLY ESCAPE_QUOTES
)
OPTION(INSTALL_CMAKE_FILES "Install generated CMake files" ON)
IF (INSTALL_CMAKE_FILES)
install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig${lib_type_suffix}.cmake
DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
)
ENDIF (INSTALL_CMAKE_FILES)
|
