Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compilation breakage #10

Merged
merged 2 commits into from
Nov 14, 2022
Merged

fix compilation breakage #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4ef9b
lighttpd: update pcre-8.43 URL
lsf37 Nov 14, 2022
82850c3
cmake: point to Arm VM
lsf37 Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@ DeclareCAmkESComponent(VM SOURCES src/cross_vm_connections.c)

# Declare root server
if(MULTI_VM_LAN)
DeclareCAmkESRootserver(multi_main.camkes CPP_INCLUDES ${CAMKES_ARM_VM_DIR}/components/VM)
DeclareCAmkESRootserver(multi_main.camkes CPP_INCLUDES ${CAMKES_ARM_VM_DIR}/components/VM_Arm)
else()
DeclareCAmkESRootserver(main.camkes CPP_INCLUDES ${CAMKES_ARM_VM_DIR}/components/VM)
DeclareCAmkESRootserver(main.camkes CPP_INCLUDES ${CAMKES_ARM_VM_DIR}/components/VM_Arm)
endif()
# Now generate the root server and the global configuration
GenerateCAmkESRootserver()
2 changes: 1 addition & 1 deletion lighttpd/Findlighttpd.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ macro(lighttpd_build_server outfile)
ExternalProject_Add(
libpcre
URL
https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.gz
https://sourceforge.net/projects/pcre/files/pcre/8.43/pcre-8.43.tar.gz
BINARY_DIR
${CMAKE_CURRENT_BINARY_DIR}/libprce-prefix/src/libpcre
BUILD_ALWAYS
Expand Down