Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cpputest] Move library to manual-link #11585

Merged
merged 2 commits into from
May 28, 2020
Merged

[cpputest] Move library to manual-link #11585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d53320b
[cpputest] Move library to manual-link
May 26, 2020
349ab87
[cpputest] Replace move patch to codes
May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/cpputest/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: cpputest
Version: 2019-9-16
Version: 2019-9-16-1
Homepage: https://github.com/cpputest/cpputest
Description: CppUTest unit testing and mocking framework for C/C++.
28 changes: 28 additions & 0 deletions ports/cpputest/instal-manual-link.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/src/CppUTest/CMakeLists.txt b/src/CppUTest/CMakeLists.txt
index 6b950d5..a1132d9 100644
--- a/src/CppUTest/CMakeLists.txt
+++ b/src/CppUTest/CMakeLists.txt
@@ -72,7 +72,7 @@ if (WIN32)
endif (WIN32)
install(TARGETS CppUTest
EXPORT CppUTestTargets
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/CppUTest"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/CppUTest")
diff --git a/src/CppUTestExt/CMakeLists.txt b/src/CppUTestExt/CMakeLists.txt
index 01fcf70..16ce279 100644
--- a/src/CppUTestExt/CMakeLists.txt
+++ b/src/CppUTestExt/CMakeLists.txt
@@ -52,7 +52,7 @@ set_target_properties(CppUTestExt PROPERTIES
PUBLIC_HEADER "${CppUTestExt_headers}")
install(TARGETS CppUTestExt
EXPORT CppUTestTargets
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/CppUTestExt"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/CppUTestExt")
6 changes: 3 additions & 3 deletions ports/cpputest/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
Expand All @@ -8,7 +6,9 @@ vcpkg_from_github(
REF 4699da9942a1bdcc33e2a8c8a48e863b0f18188e
SHA512 6f588691f1b4092b3be8167ab09f3a4a64c34715ac9397210724121d161024a43b12a88198b02b0cc8da7d72406670daaf375bb64cc4cf92c8bd2479e7a881bc
HEAD_REF master
PATCHES fix-arm-build-error.patch
PATCHES
fix-arm-build-error.patch
instal-manual-link.patch
)

vcpkg_configure_cmake(
Expand Down