Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Export targets in CMake and add include directories to target properties

Browse Source
This commit is contained in:
Markus Rickert
2017-09-10 23:39:11 +02:00
parent 5bc9d6696c
commit fbffb246fe
22 changed files with 241 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Bullet3Geometry/CMakeLists.txt
View File

@@ -1,8 +1,3 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
)
SET(Bullet3Geometry_SRCS
b3ConvexHullComputer.cpp
b3GeometryUtil.cpp
@@ -16,6 +11,10 @@ SET(Bullet3Geometry_HDRS
)
ADD_LIBRARY(Bullet3Geometry ${Bullet3Geometry_SRCS} ${Bullet3Geometry_HDRS})
target_include_directories(Bullet3Geometry PUBLIC
$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
)
if (BUILD_SHARED_LIBS)
target_link_libraries(Bullet3Geometry Bullet3Common)
endif()
@@ -27,12 +26,13 @@ IF (INSTALL_LIBS)
#FILES_MATCHING requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Geometry DESTINATION .)
INSTALL(TARGETS Bullet3Geometry EXPORT Bullet DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS Bullet3Geometry
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})
EXPORT Bullet
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)