]>
Commit | Line | Data |
---|---|---|
3606dafa JB |
1 | --- graphite2-1.3.11/src/CMakeLists.txt.orig 2018-03-05 05:05:42.000000000 +0100 |
2 | +++ graphite2-1.3.11/src/CMakeLists.txt 2018-07-13 16:19:07.098260443 +0200 | |
3 | @@ -113,11 +113,7 @@ | |
6b9299a1 | 4 | if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
3606dafa JB |
5 | set_target_properties(graphite2 PROPERTIES |
6 | COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" | |
7 | - LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" | |
6b9299a1 | 8 | - LINKER_LANGUAGE C) |
c2eb0666 JB |
9 | - if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86") |
10 | - add_definitions(-mfpmath=sse -msse2) | |
11 | - endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86") | |
624d8297 JB |
12 | + ) |
13 | if (CMAKE_COMPILER_IS_GNUCXX) | |
14 | add_definitions(-Wdouble-promotion) | |
15 | endif (CMAKE_COMPILER_IS_GNUCXX) | |
3606dafa | 16 | @@ -128,11 +124,6 @@ |
c2eb0666 JB |
17 | if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") |
18 | target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32) | |
19 | else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") | |
20 | - if (GRAPHITE2_ASAN) | |
21 | - target_link_libraries(graphite2 c gcc_s) | |
22 | - else (GRAPHITE2_ASAN) | |
23 | - target_link_libraries(graphite2 c gcc) | |
24 | - endif (GRAPHITE2_ASAN) | |
25 | include(Graphite) | |
3606dafa JB |
26 | if (BUILD_SHARED_LIBS) |
27 | nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>) |