Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert previous CMakeLists.txt changes;

Browse Source
pull/25/head
Bryan Biedenkapp 3 years ago
parent ab622ee08c
commit 53c36ce03e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

20
CMakeLists.txt
Unescape View File

@ -290,15 +290,15 @@ option(CROSS_COMPILE_ARM "Cross-compile for 32-bit ARM" off)
option(CROSS_COMPILE_AARCH64 "Cross-compile for 64-bit ARM" off) option(CROSS_COMPILE_AARCH64 "Cross-compile for 64-bit ARM" off)
option(CROSS_COMPILE_RPI_ARM "Cross-compile for (old RPi) 32-bit ARM" off) option(CROSS_COMPILE_RPI_ARM "Cross-compile for (old RPi) 32-bit ARM" off)
set(CMAKE_C_COMPILER gcc CACHE FILEPATH "CMAKE_C_COMPILER") set(CMAKE_C_COMPILER gcc)
set(CMAKE_CXX_COMPILER g++ CACHE FILEPATH "CMAKE_CXX_COMPILER") set(CMAKE_CXX_COMPILER g++)
set(ARCH amd64) set(ARCH amd64)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
message(CHECK_START "Cross compiling for 32-bit ARM") message(CHECK_START "Cross compiling for 32-bit ARM")
if (CROSS_COMPILE_ARM) if (CROSS_COMPILE_ARM)
set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc CACHE FILEPATH "CMAKE_C_COMPILER") set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++ CACHE FILEPATH "CMAKE_CXX_COMPILER") set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
set(ARCH arm) set(ARCH arm)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm)
message(CHECK_PASS "yes") message(CHECK_PASS "yes")
@ -307,8 +307,8 @@ else ()
endif (CROSS_COMPILE_ARM) endif (CROSS_COMPILE_ARM)
message(CHECK_START "Cross compiling for 64-bit ARM") message(CHECK_START "Cross compiling for 64-bit ARM")
if (CROSS_COMPILE_AARCH64) if (CROSS_COMPILE_AARCH64)
set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc CACHE FILEPATH "CMAKE_C_COMPILER") set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++ CACHE FILEPATH "CMAKE_CXX_COMPILER") set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
set(ARCH arm64) set(ARCH arm64)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64)
message(CHECK_PASS "yes") message(CHECK_PASS "yes")
@ -332,11 +332,11 @@ if (CROSS_COMPILE_RPI_ARM)
GIT_REPOSITORY https://github.com/raspberrypi/tools.git GIT_REPOSITORY https://github.com/raspberrypi/tools.git
) )
FetchContent_MakeAvailable(RPiTools) FetchContent_MakeAvailable(RPiTools)
set(CMAKE_C_COMPILER ${CMAKE_CURRENT_BINARY_DIR}/_deps/rpitools-src/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc CACHE FILEPATH "CMAKE_C_COMPILER") set(CMAKE_C_COMPILER ${CMAKE_CURRENT_BINARY_DIR}/_deps/rpitools-src/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc)
set(CMAKE_CXX_COMPILER ${CMAKE_CURRENT_BINARY_DIR}/_deps/rpitools-src/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ CACHE FILEPATH "CMAKE_CXX_COMPILER") set(CMAKE_CXX_COMPILER ${CMAKE_CURRENT_BINARY_DIR}/_deps/rpitools-src/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++)
else() else()
set(CMAKE_C_COMPILER ${RPI_ARM_TOOLS}/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc CACHE FILEPATH "CMAKE_C_COMPILER") set(CMAKE_C_COMPILER ${RPI_ARM_TOOLS}/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc)
set(CMAKE_CXX_COMPILER ${RPI_ARM_TOOLS}/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ CACHE FILEPATH "CMAKE_CXX_COMPILER") set(CMAKE_CXX_COMPILER ${RPI_ARM_TOOLS}/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++)
endif () endif ()
set(ARCH armhf) set(ARCH armhf)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.