Merge remote-tracking branch 'google/bugfix/#82-shared-library-versioning'

CMakeLists.txt

@@ -22,7 +22,7 @@ version_numbers (
     PACKAGE_VERSION_PATCH
 )
 
-set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
+set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}")
 
 # ----------------------------------------------------------------------------
 # options
@@ -259,9 +259,8 @@ foreach (TYPE IN ITEMS STATIC SHARED)
         set_target_properties (
           gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}"
                                            OUTPUT_NAME         "gflags${opts}"
-                                           # Set VERSION instead of SOVERSION such
-                                           # that it is also used on Windows
-                                           VERSION "${PACKAGE_SOVERSION}"
+                                           VERSION             "${PACKAGE_VERSION}"
+                                           SOVERSION           "${PACKAGE_SOVERSION}"
         )
         if (HAVE_SHLWAPI_H)
           target_link_libraries (gflags${opts}-${type} shlwapi.lib)