Update Version.cpp

Fix version.
Merge pull request #2765 from gerkey/assimp_5.0_release
2020-01-12 12:56:40 +01:00 · 2019-12-01 22:49:46 +01:00 · 2019-11-17 15:45:47 -08:00
2 changed files with 9 additions and 5 deletions
--- a/assimpTargets-release.cmake.in
+++ b/assimpTargets-release.cmake.in
@@ -63,7 +63,11 @@ if(MSVC)
 else()
  set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@" CACHE STRING "the suffix for the assimp libraries" )
  if(ASSIMP_BUILD_SHARED_LIBS)
-    set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
+    if(APPLE)
+      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}.@ASSIMP_VERSION_MAJOR@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+    else()
+      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
+    endif()
    set_target_properties(assimp::assimp PROPERTIES
      IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
--- a/code/Common/Version.cpp
+++ b/code/Common/Version.cpp
@@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/scene.h>
 #include "ScenePrivate.h"

-static const unsigned int MajorVersion = 4;
-static const unsigned int MinorVersion = 1;
+static const unsigned int MajorVersion = 5;
+static const unsigned int MinorVersion = 0;

 // --------------------------------------------------------------------------------
 // Legal information string - don't remove this.
@@ -56,9 +56,9 @@ static const char* LEGAL_INFORMATION =
 "Open Asset Import Library (Assimp).\n"
 "A free C/C++ library to import various 3D file formats into applications\n\n"

-"(c) 2008-2017, assimp team\n"
+"(c) 2008-2020, assimp team\n"
 "License under the terms and conditions of the 3-clause BSD license\n"
-"http://assimp.sourceforge.net\n"
+"https://github.com/assimp/assimp\n"
 ;

 // ------------------------------------------------------------------------------------------------
Author	SHA1	Message	Date
Kim Kulling	8f0c6b04b2	Update Version.cpp Fix version.	2020-01-12 12:56:40 +01:00
Kim Kulling	2cb15ba5c8	Merge pull request #2765 from gerkey/assimp_5.0_release Fix shared lib name on macOS	2019-12-01 22:49:46 +01:00
Brian Gerkey	84deb1db44	Fix shared lib name on macOS When on macOS, reverse the shared lib naming convention (as compared to Linux) to put the version number before the the lib extension. Fixes #2760	2019-11-17 15:45:47 -08:00