diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-09-19 08:17:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 17:17:21 -0700 |
| commit | 13590753fec479c5b0a3d48dd553dde8d49615fc (patch) | |
| tree | fad155e091ef56d6f91fda2b212ecfc5c0b53b5d /ports/graphite2/disable-tests.patch | |
| parent | 35d7e4f0b30800691c59b25c5ea95e4d64e0623f (diff) | |
| download | vcpkg-13590753fec479c5b0a3d48dd553dde8d49615fc.tar.gz vcpkg-13590753fec479c5b0a3d48dd553dde8d49615fc.zip | |
[inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision (#13584)
* [inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision
* Fix license path for fastrtps and remove bin with static build for kd-soap
Diffstat (limited to 'ports/graphite2/disable-tests.patch')
| -rw-r--r-- | ports/graphite2/disable-tests.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ports/graphite2/disable-tests.patch b/ports/graphite2/disable-tests.patch index 67a0d90e7..d1c1fd971 100644 --- a/ports/graphite2/disable-tests.patch +++ b/ports/graphite2/disable-tests.patch @@ -20,26 +20,29 @@ index 496712d..3df05c7 100644 set(version 3.0.1)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 389cf5a..94b7f99 100644
+index b6ac26b..851a97f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -127,7 +127,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+@@ -127,9 +127,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
endif ()
endif()
include(Graphite)
- if (BUILD_SHARED_LIBS)
+ if (NOT DISABLE_TESTS)
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
- endif ()
+- endif ()
++ endif()
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
-@@ -141,7 +141,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
- LINKER_LANGUAGE C)
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif()
+@@ -144,7 +144,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ endif()
target_link_libraries(graphite2 c)
include(Graphite)
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+ if (NOT DISABLE_TESTS)
+ nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-+ endif ()
++ endif()
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
endif()
|