Removed unnecessary toolchain files

This commit is contained in:
Patrix
2024-03-03 14:56:14 +01:00
parent ee2a72fc84
commit bc331091ab
6 changed files with 16 additions and 110 deletions

View File

@@ -45,7 +45,7 @@ build:windows:
loadenv "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" ${ARCHITECTURE} loadenv "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" ${ARCHITECTURE}
after_script: after_script:
- Add-Content -Path job.env -Value "windows_${ARCHITECTURE}_JOB_ID=${CI_JOB_ID}" - Add-Content -Path job.env -Value "${SYSTEM}_${ARCHITECTURE}_job_id=${CI_JOB_ID}"
parallel: parallel:
matrix: matrix:
- ARCHITECTURE: [x86, x64] - ARCHITECTURE: [x86, x64]
@@ -57,7 +57,7 @@ build:linux:
SYSTEM: "Linux" SYSTEM: "Linux"
SHARED_LIB_SUFFIX: ".so" SHARED_LIB_SUFFIX: ".so"
after_script: after_script:
- echo "linux_${ARCHITECTURE}_JOB_ID=${CI_JOB_ID}" >> job.env - echo "${SYSTEM}_${ARCHITECTURE}_job_id=${CI_JOB_ID}" >> job.env
parallel: parallel:
matrix: matrix:
- ARCHITECTURE: [x64, arm, arm64] - ARCHITECTURE: [x64, arm, arm64]
@@ -77,17 +77,17 @@ release:
assets: assets:
links: links:
- name: "${CI_PROJECT_NAME}.x86.dll" - name: "${CI_PROJECT_NAME}.x86.dll"
url: "${CI_PROJECT_URL}/-/jobs/${windows_x86_JOB_ID}/artifacts/download" url: "${CI_PROJECT_URL}/-/jobs/${Windows_x86_job_id}/artifacts/download"
link_type: "package" link_type: "package"
- name: "${CI_PROJECT_NAME}.x64.dll" - name: "${CI_PROJECT_NAME}.x64.dll"
url: "${CI_PROJECT_URL}/-/jobs/${windows_x64_JOB_ID}/artifacts/download" url: "${CI_PROJECT_URL}/-/jobs/${Windows_x64_job_id}/artifacts/download"
link_type: "package" link_type: "package"
- name: "${CI_PROJECT_NAME}.x64.so" - name: "${CI_PROJECT_NAME}.x64.so"
url: "${CI_PROJECT_URL}/-/jobs/${linux_x64_JOB_ID}/artifacts/download" url: "${CI_PROJECT_URL}/-/jobs/${Linux_x64_job_id}/artifacts/download"
link_type: "package" link_type: "package"
- name: "${CI_PROJECT_NAME}.arm.so" - name: "${CI_PROJECT_NAME}.arm.so"
url: "${CI_PROJECT_URL}/-/jobs/${linux_arm_JOB_ID}/artifacts/download" url: "${CI_PROJECT_URL}/-/jobs/${Linux_arm_job_id}/artifacts/download"
link_type: "package" link_type: "package"
- name: "${CI_PROJECT_NAME}.arm64.so" - name: "${CI_PROJECT_NAME}.arm64.so"
url: "${CI_PROJECT_URL}/-/jobs/${linux_arm64_JOB_ID}/artifacts/download" url: "${CI_PROJECT_URL}/-/jobs/${Linux_arm64_job_id}/artifacts/download"
link_type: "package" link_type: "package"

View File

@@ -21,6 +21,9 @@
"type": "equals", "type": "equals",
"lhs": "${hostSystemName}", "lhs": "${hostSystemName}",
"rhs": "Linux" "rhs": "Linux"
},
"cacheVariables": {
"CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++"
} }
}, },
{ {

View File

@@ -5,22 +5,9 @@
set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR arm) set(CMAKE_SYSTEM_PROCESSOR arm)
# specify shared library suffix
set(OUT_FILE_SUFFIX "arm")
if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm.*")
# specify native compiler
set(CMAKE_C_COMPILER gcc)
set(CMAKE_CXX_COMPILER g++)
else()
# specify cross compiler # specify cross compiler
set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc) set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
set(CMAKE_CXX_COMPILER arm-linux-gnueabi-g++) set(CMAKE_CXX_COMPILER arm-linux-gnueabi-g++)
endif()
# specify the compiler flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
# specify the paths for find_(name), functions (target environment). # specify the paths for find_(name), functions (target environment).
set(CMAKE_FIND_ROOT_PATH set(CMAKE_FIND_ROOT_PATH

View File

@@ -5,22 +5,9 @@
set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR aarch64) set(CMAKE_SYSTEM_PROCESSOR aarch64)
# specify shared library suffix
set(OUT_FILE_SUFFIX "arm64")
if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "aarch64")
# specify native compiler
set(CMAKE_C_COMPILER gcc)
set(CMAKE_CXX_COMPILER g++)
else()
# specify cross compiler # specify cross compiler
set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
endif()
# specify the compiler flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
# specify the paths for find_(name), functions (target environment). # specify the paths for find_(name), functions (target environment).
set(CMAKE_FIND_ROOT_PATH set(CMAKE_FIND_ROOT_PATH

View File

@@ -1,35 +0,0 @@
# Simple toolchain file for compiling under linux
# Usage: cmake .. -DCMAKE_TOOLCHAIN_FILE=linux-x64.cmake
# specify the target system properties
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR x86_64)
# specify shared library suffix
set(OUT_FILE_SUFFIX "x64")
# specify the compilers
set(CMAKE_C_COMPILER gcc)
set(CMAKE_CXX_COMPILER g++)
# specify the compiler flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
# specify the paths for find_(name), functions (target environment).
set(CMAKE_FIND_ROOT_PATH
/usr/lib
${CMAKE_CURRENT_SOURCE_DIR}
)
# search only for programs in the build host directories (find_program)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# use only CMAKE_FIND_ROOT_PATH for searching (find_library)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
# use only CMAKE_FIND_ROOT_PATH for searching (find_file, find_path)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# use only CMAKE_FIND_ROOT_PATH for searching (find_package)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

View File

@@ -1,36 +0,0 @@
# Simple toolchain file for compiling under linux
# Usage: cmake .. -DCMAKE_TOOLCHAIN_FILE=linux-x86.cmake
# specify the target system properties
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR i686)
# specify shared library suffix
set(OUT_FILE_SUFFIX "x86")
# specify the compilers
set(CMAKE_C_COMPILER i686-linux-gnu-gcc)
set(CMAKE_CXX_COMPILER i686-linux-gnu-g++)
# specify the compiler flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
# specify the paths for find_(name), functions (target environment).
set(CMAKE_FIND_ROOT_PATH
/usr/lib32
/usr/i686-linux-gnu
${CMAKE_CURRENT_SOURCE_DIR}
)
# search only for programs in the build host directories (find_program)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# use only CMAKE_FIND_ROOT_PATH for searching (find_library)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
# use only CMAKE_FIND_ROOT_PATH for searching (find_file, find_path)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# use only CMAKE_FIND_ROOT_PATH for searching (find_package)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)