Merge fix37 into masterr and fix conflict

CHANGELOG.md

@@ -13,6 +13,7 @@
  - 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 [#57](https://github.com/DanielChappuis/reactphysics3d/issues/57) has been fixed.
+ - Bug [#37](https://github.com/DanielChappuis/reactphysics3d/issues/37) has been fixed.
 
 ## Version 0.7.0 (May 1, 2018)
 

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,18 @@ IF(RP3D_COMPILE_TESTS)
    add_subdirectory(test/)
 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}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/reactphysics3d
 )