Compare commits

...

31 Commits

Author SHA1 Message Date
Siarhei Fedartsou
e29b3d5dc1 Attempt to cross-compile for arm64 Linux 2022-10-15 16:40:55 +02:00
Siarhei Fedartsou
0ead590a00 Attempt to cross-compile for arm64 Linux 2022-10-15 16:38:19 +02:00
Siarhei Fedartsou
0a454ee873 Attempt to cross-compile for arm64 Linux 2022-10-15 16:33:55 +02:00
Siarhei Fedartsou
2577c8fdb9 Attempt to cross-compile for arm64 Linux 2022-10-15 16:27:49 +02:00
Siarhei Fedartsou
7c4b2f11e6 Attempt to cross-compile for arm64 Linux 2022-10-15 16:22:00 +02:00
Siarhei Fedartsou
b43583af70 Attempt to cross-compile for arm64 Linux 2022-10-15 16:16:32 +02:00
Siarhei Fedartsou
9ae1abcc9d Attempt to cross-compile for arm64 Linux 2022-10-15 16:13:08 +02:00
Siarhei Fedartsou
df221479d1 Attempt to cross-compile for arm64 Linux 2022-10-15 16:09:24 +02:00
Siarhei Fedartsou
62310c3ef8 Attempt to cross-compile for arm64 Linux 2022-10-15 15:59:05 +02:00
Siarhei Fedartsou
97819c4622 Attempt to cross-compile for arm64 Linux 2022-10-15 15:56:44 +02:00
Siarhei Fedartsou
5870ca658d Attempt to cross-compile for arm64 Linux 2022-10-15 15:30:55 +02:00
Siarhei Fedartsou
9feecad226 Attempt to cross-compile for arm64 Linux 2022-10-15 15:26:31 +02:00
Siarhei Fedartsou
f36537a5b5 Attempt to cross-compile for arm64 Linux 2022-10-15 15:24:05 +02:00
Siarhei Fedartsou
7f1016973e Attempt to cross-compile for arm64 Linux 2022-10-15 13:47:09 +02:00
Siarhei Fedartsou
41e36a75ae Attempt to cross-compile for arm64 Linux 2022-10-15 13:43:56 +02:00
Siarhei Fedartsou
a8af28d381 Attempt to cross-compile for arm64 Linux 2022-10-15 13:41:51 +02:00
Siarhei Fedartsou
968004ed44 Attempt to cross-compile for arm64 Linux 2022-10-15 13:35:42 +02:00
Siarhei Fedartsou
099bfca60b Attempt to cross-compile for arm64 Linux 2022-10-15 13:32:49 +02:00
Siarhei Fedartsou
681169cd22 Attempt to cross-compile for arm64 Linux 2022-10-15 13:29:22 +02:00
Siarhei Fedartsou
ba6979ff36 Attempt to cross-compile for arm64 Linux 2022-10-15 13:27:42 +02:00
Siarhei Fedartsou
c8c240ea07 Attempt to cross-compile for arm64 Linux 2022-10-15 13:25:23 +02:00
Siarhei Fedartsou
3cc3729704 Attempt to cross-compile for arm64 Linux 2022-10-15 13:22:15 +02:00
Siarhei Fedartsou
53de5f26bb Attempt to cross-compile for arm64 Linux 2022-10-15 13:21:33 +02:00
Siarhei Fedartsou
820b60f079 Attempt to cross-compile for arm64 Linux 2022-10-15 13:20:41 +02:00
Siarhei Fedartsou
1c9812bfec Attempt to cross-compile for arm64 Linux 2022-10-15 13:17:38 +02:00
Siarhei Fedartsou
438227db7f Attempt to cross-compile for arm64 Linux 2022-10-15 13:15:50 +02:00
Siarhei Fedartsou
761ce3b8bf Attempt to cross-compile for arm64 Linux 2022-10-15 13:14:56 +02:00
Siarhei Fedartsou
ae9151d092 Attempt to cross-compile for arm64 Linux 2022-10-15 13:14:22 +02:00
Siarhei Fedartsou
533ecfbf28 Attempt to cross-compile for arm64 Linux 2022-10-15 13:12:35 +02:00
Siarhei Fedartsou
8e27ddf6bf Attempt to cross-compile for arm64 Linux 2022-10-15 13:07:23 +02:00
Siarhei Fedartsou
5bc283d6b2 Attempt to cross-compile for arm64 Linux 2022-10-15 13:03:01 +02:00
3 changed files with 594 additions and 461 deletions

File diff suppressed because it is too large Load Diff

View File

@ -492,6 +492,9 @@ if(ENABLE_CONAN)
set(TBB_SHARED True)
endif()
if(NOT CONAN_CMAKE_SYSTEM_PROCESSOR)
set(CONAN_CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
endif()
set(CONAN_ARGS
REQUIRES
"boost/${CONAN_BOOST_VERSION}"
@ -503,6 +506,7 @@ if(ENABLE_CONAN)
GENERATORS cmake_find_package json # json generator generates a conanbuildinfo.json in the build folder so (non-CMake) projects can easily parse OSRM's dependencies
KEEP_RPATHS
NO_OUTPUT_DIRS
ENV CONAN_CMAKE_SYSTEM_PROCESSOR=aarch64
OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake
onetbb:shared=${TBB_SHARED}
boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it
@ -511,8 +515,8 @@ if(ENABLE_CONAN)
# explicitly say Conan to use x86 dependencies if build for x86 platforms (https://github.com/conan-io/cmake-conan/issues/141)
if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
conan_cmake_run("${CONAN_ARGS};ARCH;x86")
# cross-compilation for Apple Silicon
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
# cross-compilation for arm64 processors
elseif((CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
conan_cmake_run("${CONAN_ARGS};ARCH;armv8")
else()
conan_cmake_run("${CONAN_ARGS}")

78
toolchain.cmake Normal file
View File

@ -0,0 +1,78 @@
# Conan automatically generated toolchain file
# DO NOT EDIT MANUALLY, it will be overwritten
# Avoid including toolchain file several times (bad if appending to variables like
# CMAKE_CXX_FLAGS. See https://github.com/android/ndk/issues/323
include_guard()
message(STATUS "Using Conan toolchain: ${CMAKE_CURRENT_LIST_FILE}")
if(${CMAKE_VERSION} VERSION_LESS "3.15")
message(FATAL_ERROR "The 'CMakeToolchain' generator only works with CMake >= 3.15")
endif()
# Extra c, cxx, linkflags and defines
if(DEFINED CONAN_CXX_FLAGS)
string(APPEND CMAKE_CXX_FLAGS_INIT " ${CONAN_CXX_FLAGS}")
endif()
if(DEFINED CONAN_C_FLAGS)
string(APPEND CMAKE_C_FLAGS_INIT " ${CONAN_C_FLAGS}")
endif()
if(DEFINED CONAN_SHARED_LINKER_FLAGS)
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${CONAN_SHARED_LINKER_FLAGS}")
endif()
if(DEFINED CONAN_EXE_LINKER_FLAGS)
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${CONAN_EXE_LINKER_FLAGS}")
endif()
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
if(_CMAKE_IN_TRY_COMPILE)
message(STATUS "Running toolchain IN_TRY_COMPILE")
return()
endif()
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
# Definition of CMAKE_MODULE_PATH
# the generators folder (where conan generates files, like this toolchain)
list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
# Definition of CMAKE_PREFIX_PATH, CMAKE_XXXXX_PATH
# The Conan local "generators" folder, where this toolchain is saved.
list(PREPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR} )
message(STATUS "Conan toolchain: Setting BUILD_SHARED_LIBS = ON")
set(BUILD_SHARED_LIBS ON)
set(CMAKE_INSTALL_PREFIX "/home/runner/.conan/data/onetbb/2021.3.0/_/_/package/a36e366b2b0ea0e76bafba6092e0a74838fad5fd")
set(CMAKE_INSTALL_BINDIR "bin")
set(CMAKE_INSTALL_SBINDIR "bin")
set(CMAKE_INSTALL_LIBEXECDIR "bin")
set(CMAKE_INSTALL_LIBDIR "lib")
set(CMAKE_INSTALL_INCLUDEDIR "include")
set(CMAKE_INSTALL_OLDINCLUDEDIR "include")
set(CMAKE_SYSTEM_PROCESSOR "aarch64")
# Variables
set(TBB_TEST OFF CACHE BOOL "Variable TBB_TEST conan-toolchain defined")
set(TBB_STRICT OFF CACHE BOOL "Variable TBB_STRICT conan-toolchain defined")
# Variables per configuration
# Preprocessor definitions
# Preprocessor definitions per configuration