Fix position independent code not applying everywhere.

This commit is contained in:
2021-10-31 01:46:23 +01:00
parent 2466185ccc
commit 4b4788bdbc
3 changed files with 5 additions and 5 deletions

View File

@@ -82,9 +82,9 @@ set_target_properties(lzfse PROPERTIES
C_VISIBILITY_PRESET hidden) C_VISIBILITY_PRESET hidden)
if(NOT AARU_MUSL) if(NOT AARU_MUSL)
set_property(TARGET lzfse APPEND PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) set_property(TARGET lzfse PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif() endif()
if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
set_property(TARGET lzfse APPEND PROPERTY POSITION_INDEPENDENT_CODE TRUE) set_property(TARGET lzfse PROPERTY POSITION_INDEPENDENT_CODE TRUE)
endif() endif()

2
3rdparty/zstd.cmake vendored
View File

@@ -290,5 +290,5 @@ endif ()
#endif () #endif ()
if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
set_property(TARGET libzstd_static APPEND PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET libzstd_static PROPERTY POSITION_INDEPENDENT_CODE ON)
endif() endif()

View File

@@ -114,9 +114,9 @@ ENDMACRO()
TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE("Aaru.Compression.Native" bz2_static lzlib lzfse libzstd_static lzma FLAC) TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE("Aaru.Compression.Native" bz2_static lzlib lzfse libzstd_static lzma FLAC)
if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
set_property(TARGET "Aaru.Compression.Native" APPEND PROPERTY POSITION_INDEPENDENT_CODE TRUE) set_property(TARGET "Aaru.Compression.Native" PROPERTY POSITION_INDEPENDENT_CODE TRUE)
else() else()
set_property(TARGET "Aaru.Compression.Native" APPEND PROPERTY POSITION_INDEPENDENT_CODE FALSE) set_property(TARGET "Aaru.Compression.Native" PROPERTY POSITION_INDEPENDENT_CODE FALSE)
endif() endif()
add_subdirectory(tests) add_subdirectory(tests)