From a8e9aa99f19c68f250015f1434ac5be70198b1a9 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sat, 25 Apr 2020 17:03:26 -0400 Subject: [PATCH] Improve CMakeLists.txt --- Dockerfile | 10 ++++++---- src/main/c/CMakeLists.txt | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b54c9fe..d3375b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,10 @@ FROM ubuntu:bionic RUN apt-get update && \ - apt-get install -y \ + apt-get install --no-install-recommends -y \ curl \ openjdk-11-jdk-headless \ make \ - gcc-multilib-i686-linux-gnu \ - gcc-multilib-arm-linux-gnueabihf \ - gcc-aarch64-linux-gnu \ clang \ lld \ mingw-w64 \ @@ -19,6 +16,11 @@ RUN apt-get update && \ gnupg \ software-properties-common +RUN apt-get install -y \ + gcc-multilib-i686-linux-gnu \ + gcc-multilib-arm-linux-gnueabihf \ + gcc-aarch64-linux-gnu + RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \ apt-get install --no-install-recommends -y nodejs diff --git a/src/main/c/CMakeLists.txt b/src/main/c/CMakeLists.txt index 4963d10..87d04be 100644 --- a/src/main/c/CMakeLists.txt +++ b/src/main/c/CMakeLists.txt @@ -2,7 +2,23 @@ cmake_minimum_required(VERSION 3.13) project(scriptcraft C) -add_compile_options(-Wall -Werror -Wno-implicit-int-float-conversion -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -Wno-sign-compare -Wno-missing-field-initializers -Wundef -Wuninitialized -Wunused -Wno-unused-parameter -Wwrite-strings -Wchar-subscripts -funsigned-char) +add_compile_options( + -Wall + -Werror + -Wno-implicit-int-float-conversion + -Wno-int-to-pointer-cast + -Wno-pointer-to-int-cast + -Wno-sign-compare + -Wno-missing-field-initializers + -Wundef + -Wuninitialized + -Wunused + -Wno-unused-parameter + -Wwrite-strings + -Wchar-subscripts + -funsigned-char + -Wno-unknown-warning-option +) add_library( scriptcraft