ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/gtest/fix-main-lib-path.patch

   1 diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
   2 index e7df8ec..1ecd596 100644
   3 --- a/googlemock/CMakeLists.txt
   4 +++ b/googlemock/CMakeLists.txt
   5 @@ -120,7 +120,8 @@ endif()
   6  ########################################################################
   7  #
   8  # Install rules
   9 -install_project(gmock gmock_main)
  10 +install_project(gmock)
  11 +install_project(gmock_main)
  12
  13  ########################################################################
  14  #
  15 diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
  16 index abdd98b..7d1c01d 100644
  17 --- a/googletest/CMakeLists.txt
  18 +++ b/googletest/CMakeLists.txt
  19 @@ -148,7 +148,8 @@ target_link_libraries(gtest_main PUBLIC gtest)
  20  ########################################################################
  21  #
  22  # Install rules
  23 -install_project(gtest gtest_main)
  24 +install_project(gtest)
  25 +install_project(gtest_main)
  26
  27  ########################################################################
  28  #
  29 diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
  30 index 8d8d60a..b08ce28 100644
  31 --- a/googletest/cmake/internal_utils.cmake
  32 +++ b/googletest/cmake/internal_utils.cmake
  33 @@ -315,11 +315,15 @@ function(install_project)
  34      install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
  35        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
  36      # Install the project targets.
  37 +    set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR})
  38 +    if (${ARGN} MATCHES "_main")
  39 +      set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link)
  40 +    endif()
  41      install(TARGETS ${ARGN}
  42        EXPORT ${targets_export_name}
  43        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
  44 -      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
  45 -      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
  46 +      ARCHIVE DESTINATION "${LIB_INSTALL_DST}"
  47 +      LIBRARY DESTINATION "${LIB_INSTALL_DST}")
  48      if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
  49        # Install PDBs
  50        foreach(t ${ARGN})
  51 @@ -328,7 +332,7 @@ function(install_project)
  52          get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY)
  53          install(FILES
  54            "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
  55 -          DESTINATION ${CMAKE_INSTALL_LIBDIR}
  56 +          DESTINATION ${LIB_INSTALL_DST}
  57            OPTIONAL)
  58        endforeach()
  59      endif()
  60 @@ -338,7 +342,7 @@ function(install_project)
  61        configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
  62          "${configured_pc}" @ONLY)
  63        install(FILES "${configured_pc}"
  64 -        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
  65 +        DESTINATION "${LIB_INSTALL_DST}/pkgconfig")
  66      endforeach()
  67    endif()
  68  endfunction()