vcpkg/ports/gtest/fix-main-lib-path.patch

65 lines
2.4 KiB
Diff
Raw Permalink Normal View History

diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
2024-07-26 02:13:06 -05:00
index 99b2411f..74610b12 100644
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
2024-07-26 02:13:06 -05:00
@@ -112,8 +112,9 @@ target_include_directories(gmock_main SYSTEM INTERFACE
########################################################################
#
2024-07-26 02:13:06 -05:00
-# Install rules.
-install_project(gmock gmock_main)
2024-07-26 02:13:06 -05:00
+# Install rules
+install_project(gmock)
+install_project(gmock_main)
########################################################################
#
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
2024-07-26 02:13:06 -05:00
index dce6a7c9..d8faf644 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
2024-07-26 02:13:06 -05:00
@@ -154,8 +154,9 @@ target_link_libraries(gtest_main PUBLIC gtest)
########################################################################
#
2024-07-26 02:13:06 -05:00
-# Install rules.
-install_project(gtest gtest_main)
2024-07-26 02:13:06 -05:00
+# Install rules
+install_project(gtest)
+install_project(gtest_main)
########################################################################
#
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
2024-07-26 02:13:06 -05:00
index 580ac1cb..78a5b659 100644
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
2024-07-26 02:13:06 -05:00
@@ -302,12 +302,16 @@ function(install_project)
2023-09-13 23:54:23 +01:00
COMPONENT "${PROJECT_NAME}"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
# Install the project targets.
+ set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR})
+ if (${ARGN} MATCHES "_main")
+ set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link)
2023-09-13 23:54:23 +01:00
+ endif()
install(TARGETS ${ARGN}
EXPORT ${targets_export_name}
2023-09-13 23:54:23 +01:00
COMPONENT "${PROJECT_NAME}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ ARCHIVE DESTINATION "${LIB_INSTALL_DST}"
+ LIBRARY DESTINATION "${LIB_INSTALL_DST}")
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
2024-07-26 02:13:06 -05:00
# Install PDBs.
foreach(t ${ARGN})
2024-07-26 02:13:06 -05:00
@@ -317,7 +321,7 @@ function(install_project)
install(FILES
"${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
2023-09-13 23:54:23 +01:00
COMPONENT "${PROJECT_NAME}"
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ DESTINATION ${LIB_INSTALL_DST}
OPTIONAL)
endforeach()
endif()