OAuth package: fixed a versioning issue on Linux and macOS (#1306).

opencor · May 15, 2017 · bad2015 · bad2015
1 parent 9a5feb7
commit bad2015
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/plugins/thirdParty/OAuth/CMakeLists.txt b/src/plugins/thirdParty/OAuth/CMakeLists.txt
@@ -7,7 +7,8 @@ SET(PACKAGE_VERSION "1.0.1")
 
 # Version of our library
 
-SET(LIBRARY_VERSION "1.0.1")
+SET(REAL_LIBRARY_VERSION "1.0.1")
+SET(USED_LIBRARY_VERSION "1.0.0")
 
 # Git tag for our library
 
@@ -23,10 +24,10 @@ IF(WIN32)
     SET(SHARED_LIBRARY o2${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(IMPORT_LIBRARY o2${CMAKE_IMPORT_LIBRARY_SUFFIX})
 ELSEIF(APPLE)
-    SET(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}o2.${LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+    SET(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}o2.${USED_LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(IMPORT_LIBRARY ${SHARED_LIBRARY})
 ELSE()
-    SET(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}o2${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBRARY_VERSION})
+    SET(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}o2${CMAKE_SHARED_LIBRARY_SUFFIX}.${USED_LIBRARY_VERSION})
     SET(IMPORT_LIBRARY ${SHARED_LIBRARY})
 ENDIF()
 
@@ -139,9 +140,9 @@ ELSE()
         SET(FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${SHARED_LIBRARY})
 
         IF(APPLE)
-            SET(REAL_FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}o2.${LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+            SET(REAL_FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}o2.${REAL_LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
         ELSE()
-            SET(REAL_FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}o2${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBRARY_VERSION})
+            SET(REAL_FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}o2${CMAKE_SHARED_LIBRARY_SUFFIX}.${REAL_LIBRARY_VERSION})
         ENDIF()
 
         ExternalProject_Add_Step(${PACKAGE_BUILD} CopyLibrary