|
|
@@ -102,15 +102,18 @@ if(UNIX)
|
|
|
|
|
|
# guess Debian multiarch if it has not been set:
|
|
|
if(EXISTS /etc/debian_version)
|
|
|
- if(NOT CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE )
|
|
|
+ if(NOT CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE )
|
|
|
file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* )
|
|
|
foreach(file ${filesInLib})
|
|
|
if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}")
|
|
|
- set(CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE ${file})
|
|
|
+ set(CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ${file})
|
|
|
break()
|
|
|
endif()
|
|
|
endforeach()
|
|
|
endif()
|
|
|
+ if(NOT CMAKE_LIBRARY_ARCHITECTURE)
|
|
|
+ set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE})
|
|
|
+ endif()
|
|
|
endif()
|
|
|
|
|
|
endif()
|