Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Flössie
2019-05-31 09:05:36 +02:00
35 changed files with 201 additions and 145 deletions

View File

@@ -375,8 +375,12 @@ if(WITH_LTO)
string(REGEX REPLACE ".* ([0-9.]+)\n.*" "\\1" BINUTILS_VERSION_DETECTED "${BINUTILS_VERSION_DETECTED}")
if("${BINUTILS_VERSION_DETECTED}" VERSION_LESS "${BINUTILS_VERSION_MININUM}")
if(APPLE)
set(CMAKE_AR "/opt/local/bin/ar")
set(CMAKE_RANLIB "/opt/local/bin/ranlib")
if(!CMAKE_AR)
set(CMAKE_AR "/opt/local/bin/ar")
endif()
if(!CMAKE_RANLIB)
set(CMAKE_RANLIB "/opt/local/bin/ranlib")
endif()
else()
set(CMAKE_AR "/usr/bin/gcc-ar")
set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")