diff options
| author | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
| commit | 5b1e426929b40a9b60809284993b424b841a28fc (patch) | |
| tree | bd12300ad859bababb7d4acc03700fd31949fddc /ports/graphite2/disable-tests.patch | |
| parent | 279e25aecfe30f55296881ea9b0236c1d6ee030a (diff) | |
| parent | 358ec0954d9b71b0def4fd4b4dbafdd0b8478d81 (diff) | |
| download | vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.tar.gz vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.zip | |
Merge remote-tracking branch 'upstream/master' into path_separator
# Conflicts:
# scripts/cmake/vcpkg_common_definitions.cmake
Diffstat (limited to 'ports/graphite2/disable-tests.patch')
| -rw-r--r-- | ports/graphite2/disable-tests.patch | 62 |
1 files changed, 37 insertions, 25 deletions
diff --git a/ports/graphite2/disable-tests.patch b/ports/graphite2/disable-tests.patch index ccb2ac822..67a0d90e7 100644 --- a/ports/graphite2/disable-tests.patch +++ b/ports/graphite2/disable-tests.patch @@ -1,33 +1,45 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4c648e..db90735 100644
+index 496712d..3df05c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -80,11 +80,13 @@ if (BUILD_SHARED_LIBS)
- endif (BUILD_SHARED_LIBS)
+@@ -82,10 +82,12 @@ if (BUILD_SHARED_LIBS)
+ endif()
add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(doc)
+-if (NOT GRAPHITE2_NFILEFACE)
+- add_subdirectory(gr2fonttest)
+if(NOT DISABLE_TESTS)
- add_subdirectory(tests)
- add_subdirectory(doc)
- if (NOT GRAPHITE2_NFILEFACE)
- add_subdirectory(gr2fonttest)
- endif (NOT GRAPHITE2_NFILEFACE)
-+endif()
++ add_subdirectory(tests)
++ add_subdirectory(doc)
++ if (NOT GRAPHITE2_NFILEFACE)
++ add_subdirectory(gr2fonttest)
++ endif()
+ endif()
set(version 3.0.1)
- set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 89a59af..c72be21 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -141,7 +141,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - LINKER_LANGUAGE C) - 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() - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") - CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") - endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 389cf5a..94b7f99 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -127,7 +127,7 @@ 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 ()
+ set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+@@ -141,7 +141,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ LINKER_LANGUAGE C)
+ 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 ()
+ set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif()
|