diff --git a/cmake/platforms/Linux32.cmake b/cmake/platforms/Linux32.cmake --- a/cmake/platforms/Linux32.cmake +++ b/cmake/platforms/Linux32.cmake @@ -14,11 +14,13 @@ # We also may have built dependencies for the native platform. set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}/native") -# Modify default behavior of FIND_XXX() commands to -# search for headers/libs in the target environment and -# search for programs in the build host environment +# Modify default behavior of FIND_XXX() commands to: +# - search for headers in the target environment, +# - search the libraries in the target environment first then the host (to find +# the compiler supplied libraries), +# - search for programs in the build host environment. set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) string(APPEND CMAKE_C_FLAGS_INIT " -m32") diff --git a/cmake/platforms/Linux64.cmake b/cmake/platforms/Linux64.cmake --- a/cmake/platforms/Linux64.cmake +++ b/cmake/platforms/Linux64.cmake @@ -14,11 +14,13 @@ # We also may have built dependencies for the native platform. set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}/native") -# Modify default behavior of FIND_XXX() commands to -# search for headers/libs in the target environment and -# search for programs in the build host environment +# Modify default behavior of FIND_XXX() commands to: +# - search for headers in the target environment, +# - search the libraries in the target environment first then the host (to find +# the compiler supplied libraries), +# - search for programs in the build host environment. set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) string(APPEND CMAKE_C_FLAGS_INIT " -m64") diff --git a/cmake/platforms/LinuxAArch64.cmake b/cmake/platforms/LinuxAArch64.cmake --- a/cmake/platforms/LinuxAArch64.cmake +++ b/cmake/platforms/LinuxAArch64.cmake @@ -9,7 +9,10 @@ # Target environment on the build host system # Set 1st to directory with the cross compiler's C/C++ headers/libs -set(CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}") +set(CMAKE_FIND_ROOT_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}" + "/usr/${TOOLCHAIN_PREFIX}" +) # We also may have built dependencies for the native platform. set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}/native") diff --git a/cmake/platforms/LinuxARM.cmake b/cmake/platforms/LinuxARM.cmake --- a/cmake/platforms/LinuxARM.cmake +++ b/cmake/platforms/LinuxARM.cmake @@ -9,7 +9,10 @@ # Target environment on the build host system # Set 1st to directory with the cross compiler's C/C++ headers/libs -set(CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}") +set(CMAKE_FIND_ROOT_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}" + "/usr/${TOOLCHAIN_PREFIX}" +) # We also may have built dependencies for the native platform. set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/depends/${TOOLCHAIN_PREFIX}/native")