From e94bb01577309d4b8a1492fa3a7b76923036dd31 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Tue, 31 Jul 2018 20:12:15 +0200 Subject: [PATCH 1/4] Fix CMake install issue (not installing headers and always building a static library) --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 147a6a73..decc5367 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,7 +234,7 @@ SET (REACTPHYSICS3D_SOURCES ) # Create the library -ADD_LIBRARY(reactphysics3d STATIC ${REACTPHYSICS3D_HEADERS} ${REACTPHYSICS3D_SOURCES}) +ADD_LIBRARY(reactphysics3d ${REACTPHYSICS3D_HEADERS} ${REACTPHYSICS3D_SOURCES}) # Headers TARGET_INCLUDE_DIRECTORIES(reactphysics3d PUBLIC @@ -252,10 +252,12 @@ IF(RP3D_COMPILE_TESTS) add_subdirectory(test/) ENDIF() +SET_TARGET_PROPERTIES(reactphysics3d PROPERTIES PUBLIC_HEADER "${REACTPHYSICS3D_HEADERS}") + # Install target INSTALL(TARGETS reactphysics3d - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/reactphysics3d + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/reactphysics3d + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/reactphysics3d + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/reactphysics3d ) From e84787354a464d3d86c8f0d638073c68632330be Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Tue, 31 Jul 2018 20:57:58 +0200 Subject: [PATCH 2/4] Edit changelog file --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98dd4061..b0b5f702 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Bug [#55](https://github.com/DanielChappuis/reactphysics3d/issues/55) has been fixed. - Bug [#51](https://github.com/DanielChappuis/reactphysics3d/issues/51) has been fixed. - Bug [#60](https://github.com/DanielChappuis/reactphysics3d/issues/60) has been fixed. + - Bug [#37](https://github.com/DanielChappuis/reactphysics3d/issues/37) has been fixed. ## Version 0.7.0 (May 1, 2018) From 0b55308f83e802217de829aeccfe9bbc178a37fe Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Wed, 1 Aug 2018 00:11:41 +0200 Subject: [PATCH 3/4] Do not install the library in a subdirectory in CMakeLists.txt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index decc5367..b4aa114b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,8 +256,8 @@ SET_TARGET_PROPERTIES(reactphysics3d PROPERTIES PUBLIC_HEADER "${REACTPHYSICS3D_ # Install target INSTALL(TARGETS reactphysics3d - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/reactphysics3d - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/reactphysics3d - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/reactphysics3d + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/reactphysics3d ) From f86038aa31875daacc2d950be7b999c0d6a19986 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Sat, 4 Aug 2018 07:25:32 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Add=C2=A0VERSION=20and=20SOVERSION=20for=20?= =?UTF-8?q?the=20shared=20library=20in=20CMakeLists.txt=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4aa114b..389fadcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,6 +254,12 @@ ENDIF() SET_TARGET_PROPERTIES(reactphysics3d PROPERTIES PUBLIC_HEADER "${REACTPHYSICS3D_HEADERS}") +# Version number and soname for the library +SET_TARGET_PROPERTIES(reactphysics3d PROPERTIES + VERSION "0.7.0" + SOVERSION "0.7" +) + # Install target INSTALL(TARGETS reactphysics3d ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}