From 6069dca392047fd1acddd7d66e6a007cdf08ea20 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 23 Aug 2018 13:28:32 +0200 Subject: [PATCH] cmake: some improvements to the build system --- CMakeLists.txt | 15 ++++++--------- packaging/docker/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc023b794..219622fae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,10 @@ cmake_minimum_required(VERSION 3.6) -project(VILLASnode C CXX) +project(villas-node + DESCRIPTION "VILLASnode" + LANGUAGES C CXX +) # Several CMake settings/defaults set(CMAKE_C_STANDARD 11) @@ -30,7 +33,7 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_THREAD_PREFER_PTHREAD ON) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -if(CMAKE_SOURCE_DIR STREQUAL VILLASnode_SOURCE_DIR) +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) set(TOPLEVEL_PROJECT ON) endif() @@ -54,13 +57,7 @@ if(APPLE) endif() add_definitions(-D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE) -add_compile_options(-fdiagnostics-color=auto) - -if(MSVC) - add_compile_options(/W4 /WX) -else() - add_compile_options(-Wall -Werror) -endif() +add_compile_options(-Wall -Werror -fdiagnostics-color=auto) execute_process( COMMAND uname -m diff --git a/packaging/docker/CMakeLists.txt b/packaging/docker/CMakeLists.txt index c9a11f488..f1a54e669 100644 --- a/packaging/docker/CMakeLists.txt +++ b/packaging/docker/CMakeLists.txt @@ -33,7 +33,7 @@ set(DOCKER_RUN_OPTS --publish 2345:2345 --privileged --security-opt seccomp:unconfined - --volume \"${VILLASnode_SOURCE_DIR}:/villas\" + --volume \"${PROJECT_SOURCE_DIR}:/villas\" ) foreach(SUFFIX app dev dev-centos dev-ubuntu) @@ -59,7 +59,7 @@ foreach(SUFFIX app dev dev-centos dev-ubuntu) --build-arg GIT_REV=${GIT_REV} --build-arg VERSION=${PROJECT_VERSION} --build-arg VARIANT=${VARIANT} - ${DOCKER_BUILD_OPTS} ${VILLASnode_SOURCE_DIR} + ${DOCKER_BUILD_OPTS} ${PROJECT_SOURCE_DIR} COMMENT "Build Docker image: ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG}" )