Fix CMake install issue (not installing headers and always building a static library)

This commit is contained in:
Daniel Chappuis 2018-07-31 20:12:15 +02:00
parent 0db50eb59c
commit e94bb01577

View File

@ -234,7 +234,7 @@ SET (REACTPHYSICS3D_SOURCES
) )
# Create the library # Create the library
ADD_LIBRARY(reactphysics3d STATIC ${REACTPHYSICS3D_HEADERS} ${REACTPHYSICS3D_SOURCES}) ADD_LIBRARY(reactphysics3d ${REACTPHYSICS3D_HEADERS} ${REACTPHYSICS3D_SOURCES})
# Headers # Headers
TARGET_INCLUDE_DIRECTORIES(reactphysics3d PUBLIC TARGET_INCLUDE_DIRECTORIES(reactphysics3d PUBLIC
@ -252,10 +252,12 @@ IF(RP3D_COMPILE_TESTS)
add_subdirectory(test/) add_subdirectory(test/)
ENDIF() ENDIF()
SET_TARGET_PROPERTIES(reactphysics3d PROPERTIES PUBLIC_HEADER "${REACTPHYSICS3D_HEADERS}")
# Install target # Install target
INSTALL(TARGETS reactphysics3d INSTALL(TARGETS reactphysics3d
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/reactphysics3d
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/reactphysics3d
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/reactphysics3d
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/reactphysics3d
) )