[PTI-LIB] Use the Major Version as the SOVERSION (#464)

* Change library versioning from SOVERSION being MAJOR.MINOR to
  SOVERSION being just the MAJOR version. This enables users to upgrade
  to newer versions of PTI easier.

* Add versionless import library on Windows (platform without namelink
  component). This makes it easier for users to find PIT.

Signed-off-by: Schilling, Matthew <[email protected]>

Author: mschilling0

sdk/CMakeLists.txt

@@ -64,10 +64,7 @@ set(PTI_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
 set(PTI_INSTALL_LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
 set(PTI_INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}")
 set(PTI_INSTALL_LIC_DIR "${CMAKE_INSTALL_DOCDIR}")
-set(PTI_API_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
-
-set(PTI_L0_LOADER 1.20.1)
-set(PTI_L0_LOADER_COMMIT_HASH 3969f34c16a843b943b948f8fe7081ef87deb369)
+set(PTI_API_SOVERSION "${PROJECT_VERSION_MAJOR}")
 
 CheckSOVersion(${PTI_API_SOVERSION})
 CheckExperimentalFilesystem()
@@ -77,8 +74,11 @@ GetSpdlog()
 
 find_package(Xpti)
 
+set(PTI_L0_LOADER 1.20.1)
+set(PTI_L0_LOADER_COMMIT_HASH 3969f34c16a843b943b948f8fe7081ef87deb369)
+
 if(NOT PROJECT_IS_TOP_LEVEL)
-  find_package(LevelZero ${PTI_L0_LOADER} REQUIRED)  
+  find_package(LevelZero ${PTI_L0_LOADER} REQUIRED)
 else()
   find_package(LevelZero ${PTI_L0_LOADER})
 endif()
@@ -141,15 +141,9 @@ set_target_properties(
 if (WIN32)
   set_target_properties(
     pti
-    PROPERTIES OUTPUT_NAME "pti-${PROJECT_VERSION_MAJOR}-${PROJECT_VERSION_MINOR}"
-               DEBUG_POSTFIX "d"
+    PROPERTIES DEBUG_POSTFIX "d"
   )
   AddProjectVersionInfo(pti)
-else()
-  set_target_properties(
-    pti
-    PROPERTIES SUFFIX ".so.${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
-  )
 endif()
 
 target_compile_definitions(
@@ -201,9 +195,12 @@ set_target_properties(
 if (WIN32)
   set_target_properties(
     pti_view
-    PROPERTIES OUTPUT_NAME "pti_view-${PROJECT_VERSION_MAJOR}-${PROJECT_VERSION_MINOR}"
+    PROPERTIES OUTPUT_NAME "pti_view-${PROJECT_VERSION_MAJOR}"
                DEBUG_POSTFIX "d"
   )
+
+  AddVersionlessLinkFile(pti_view)
+
   AddProjectVersionInfo(pti_view)
 endif()
 
@@ -251,9 +248,10 @@ set_target_properties(
 if (WIN32)
   set_target_properties(
     pti_metrics
-    PROPERTIES OUTPUT_NAME "pti_metrics-${PROJECT_VERSION_MAJOR}-${PROJECT_VERSION_MINOR}"
+    PROPERTIES OUTPUT_NAME "pti_metrics-${PROJECT_VERSION_MAJOR}"
                DEBUG_POSTFIX "d"
   )
+  AddVersionlessLinkFile(pti_metrics)
   AddProjectVersionInfo(pti_metrics)
 endif()
 
@@ -345,6 +343,14 @@ if(PTI_INSTALL)
     DESTINATION "${PTI_INSTALL_CMAKE_DIR}"
     COMPONENT Pti_Development)
 
+  if(WIN32)
+    install(
+      FILES $<TARGET_LINKER_FILE_DIR:pti_view>/pti_view$<$<CONFIG:Debug>:d>${CMAKE_LINK_LIBRARY_SUFFIX}
+            $<TARGET_LINKER_FILE_DIR:pti_metrics>/pti_metrics$<$<CONFIG:Debug>:d>${CMAKE_LINK_LIBRARY_SUFFIX}
+      COMPONENT Pti_Development
+      DESTINATION "${PTI_INSTALL_LIB_DIR}")
+  endif()
+
   if (EXISTS "${PROJECT_SOURCE_DIR}/../LICENSE")
     install(
       FILES "../LICENSE"

sdk/cmake/Modules/macros.cmake

@@ -214,13 +214,6 @@ macro(CheckSOVersion PROJ_SOVERSION)
                     "${PROJ_SOVERSION}. After the first major release, ${PROJECT_NAME}"
                     " should have the SOVERSION: ${PROJECT_VERSION_MAJOR}.")
     endif()
-  else()
-    if("${PROJ_SOVERSION}" STREQUAL "${PROJECT_VERSION_MAJOR}")
-      message(AUTHOR_WARNING "${PROJECT_NAME} currently has the SOVERSION: "
-                    "${PROJ_SOVERSION}. During development, ${PROJECT_NAME}"
-                    " should have the SOVERSION:"
-                    " ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.")
-    endif()
   endif()
 endmacro()
 
@@ -553,3 +546,10 @@ macro(CheckExperimentalFilesystem)
     endif()
   endif()
 endmacro()
+
+macro(AddVersionlessLinkFile MY_TARGET)
+  add_custom_command(TARGET ${MY_TARGET} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_LINKER_FILE:${MY_TARGET}>
+    $<TARGET_LINKER_FILE_DIR:${MY_TARGET}>/${CMAKE_SHARED_LIBRARY_PREFIX}${MY_TARGET}$<$<PLATFORM_ID:Windows>:$<$<CONFIG:Debug>:d>>${CMAKE_LINK_LIBRARY_SUFFIX}
+  )
+endmacro()

sdk/src/utils/platform_strings.h

@@ -20,13 +20,9 @@
 
 #if !defined(PTI_VIEW_CORE_LIB_NAME)
 #if defined(_WIN32)
-#define PTI_VIEW_CORE_LIB_NAME_STRING \
-  "pti"                               \
-  "-" TOSTRING(PTI_VERSION_MAJOR) "-" TOSTRING(PTI_VERSION_MINOR) ".dll"
+#define PTI_VIEW_CORE_LIB_NAME_STRING "pti.dll"
 #else
-#define PTI_VIEW_CORE_LIB_NAME_STRING \
-  "libpti.so"                         \
-  "." TOSTRING(PTI_VERSION_MAJOR) "." TOSTRING(PTI_VERSION_MINOR)
+#define PTI_VIEW_CORE_LIB_NAME_STRING "libpti.so"
 #endif
 #else
 #define PTI_VIEW_CORE_LIB_NAME_STRING TOSTRING(PTI_VIEW_CORE_LIB_NAME)