Skip to content
Snippets Groups Projects
Unverified Commit e37a3d30 authored by Steffen Vogel's avatar Steffen Vogel :santa_tone2: Committed by GitHub
Browse files

Merge pull request #634 from VILLASframework/fix-ci

CMake: fix CI if not run in a Git repo
parents 8a2818aa 7d982e12
No related branches found
No related tags found
No related merge requests found
Pipeline #888901 passed
......@@ -5,16 +5,18 @@
# @license Apache 2.0
###################################################################################
cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 3.14)
project(villas-node
VERSION 0.0.0
DESCRIPTION "VILLASnode"
HOMEPAGE_URL "https://www.fein-aachen.org/projects/villas-node/"
LANGUAGES C CXX
)
# Some more project settings
set(PROJECT_AUTHOR "Steffen Vogel")
set(PROJECT_COPYRIGHT "2014-2021, Institute for Automation of Complex Power Systems, RWTH Aachen University")
set(PROJECT_HOMEPAGE_URL "https://www.fein-aachen.org/projects/villas-node/")
# Several CMake settings/defaults
set(CMAKE_C_STANDARD 11)
......@@ -300,15 +302,19 @@ add_feature_info(NODE_ZEROMQ WITH_NODE_ZEROMQ "Build with
if(TOPLEVEL_PROJECT)
feature_summary(WHAT ALL VAR FEATURES)
message(STATUS "${FEATURES}")
message(STATUS "Building ${CMAKE_PROJECT_DESCRIPTION}:")
message(STATUS " VERSION: ${CMAKE_PROJECT_VERSION}")
message(STATUS " RELEASE: ${CMAKE_PROJECT_RELEASE}")
message(STATUS " GIT_REV: ${CMAKE_PROJECT_GIT_REV}")
message(STATUS " GIT_BRANCH: ${CMAKE_PROJECT_GIT_BRANCH}")
message(STATUS " VARIANT: ${CMAKE_PROJECT_VARIANT}")
message(STATUS " BUILD_ID: ${CMAKE_PROJECT_BUILD_ID}")
message(STATUS " BUILD_DATE: ${CMAKE_PROJECT_BUILD_DATE}")
message(STATUS "${FEATURES}")
if(FOUND_GIT_VERSION)
message(STATUS " VERSION: ${CMAKE_PROJECT_VERSION}")
message(STATUS " RELEASE: ${CMAKE_PROJECT_RELEASE}")
message(STATUS " GIT_REV: ${CMAKE_PROJECT_GIT_REV}")
message(STATUS " GIT_BRANCH: ${CMAKE_PROJECT_GIT_BRANCH}")
message(STATUS " VARIANT: ${CMAKE_PROJECT_VARIANT}")
message(STATUS " BUILD_ID: ${CMAKE_PROJECT_BUILD_ID}")
message(STATUS " BUILD_DATE: ${CMAKE_PROJECT_BUILD_DATE}")
endif()
message(STATUS " ARCH: ${CMAKE_SYSTEM_PROCESSOR}")
message(STATUS " OS: ${CMAKE_SYSTEM_NAME}")
endif()
......
Subproject commit 729b877a405b3bd80205fa1c54bfedbf2f030dc2
Subproject commit b18d2aca5b9a158aaba3a0f82cffe253fc427b15
......@@ -129,7 +129,7 @@ int FpgaNode::prepare()
intf = std::dynamic_pointer_cast<fpga::ip::Node>(intfCore);
if (!intf)
throw RuntimeError("The IP {} is not a interface", *intf);
throw RuntimeError("The IP {} is not a interface", *intfCore);
auto dmaCore = dmaName.empty()
? card->lookupIp(fpga::Vlnv(FPGA_DMA_VLNV))
......@@ -139,7 +139,7 @@ int FpgaNode::prepare()
dma = std::dynamic_pointer_cast<fpga::ip::Dma>(dmaCore);
if (!dma)
throw RuntimeError("The IP {} is not a DMA controller", *dma);
throw RuntimeError("The IP {} is not a DMA controller", *dmaCore);
int ret = intf->connect(*(dma), true);
if (ret)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment