aports/main/graphite2/cmake.patch
Chloe Kudryavtsev ad6c116184 main/graphite2: upgrade to 1.3.13, update
- Updates package to latest version
- Fixes bugs.a.o#10329
- Remakes patch to apply cleanly
- Updates license to SPDX
- Removes empty variables
2019-05-24 09:03:54 +00:00

23 lines
1 KiB
Diff

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6ac26b..0371b0c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,11 +120,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
- if (GRAPHITE2_SANITIZERS)
- target_link_libraries(graphite2 c gcc_s)
- else ()
- target_link_libraries(graphite2 c gcc)
- endif ()
+ target_link_libraries(graphite2 c gcc_s -lssp_nonshared)
endif()
include(Graphite)
if (BUILD_SHARED_LIBS)
@@ -156,4 +152,4 @@ endif()
install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
+install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/cmake/graphite2 NAMESPACE gr2_)