mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-17 22:52:40 +01:00
aeb65ff53e
The patch is neeed to fix build on x86 and to fix install directory for cmake files so they are included in -dev subpackage.
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 89a59af..b69e244 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 (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
|
|
include(Graphite)
|
|
if (BUILD_SHARED_LIBS)
|
|
@@ -153,4 +149,4 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
|
|
|
|
|
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_)
|